OSDN Git Service

fix conflict
authorshenao78 <shenao.78@163.com>
Wed, 27 Oct 2021 09:49:06 +0000 (17:49 +0800)
committershenao78 <shenao.78@163.com>
Wed, 27 Oct 2021 09:49:06 +0000 (17:49 +0800)
commit071da665eebcdcc85787fab6fd9257c846afdf1e
tree8a4a71e0c89eb2edb8bbe5d1c3c3c3f43e9872b9
parent6a707672c8cf6eff2a7bd14f5599b3348766b9e8
parent62a9d7cec75f5296dccc8e18a1c808e47b0742ed
fix conflict
protocol/bc/types/block_header.go