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)
1  2 
blockchain/pool.go
blockchain/transact.go
blockchain/txbuilder/finalize.go

Simple merge
Simple merge
Simple merge