OSDN Git Service

fix conflicts
authorgguoss <1536310027@qq.com>
Tue, 26 Sep 2017 04:52:44 +0000 (12:52 +0800)
committergguoss <1536310027@qq.com>
Tue, 26 Sep 2017 04:52:44 +0000 (12:52 +0800)
commitc3a9210829904248b66ed8190850e8e6c64aae60
tree8472144e5fea31c85bbf39affb2e97d01f15a19e
parent42fba474824ace859b8ccd72138a1bd6981a670b
parent5869538c3397768e6ad54a71811911bdb617a1d4
fix conflicts
blockchain/pool.go
blockchain/transact.go
blockchain/txbuilder/finalize.go