OSDN Git Service

fix conflict
authorChengcheng Zhang <943420582@qq.com>
Mon, 20 May 2019 02:12:46 +0000 (10:12 +0800)
committerChengcheng Zhang <943420582@qq.com>
Mon, 20 May 2019 02:12:46 +0000 (10:12 +0800)
commite3270b5eb361e55ac27137abd7b64e02eb50c853
tree541cf888906b5d397fd56db01ecb3ed31dcbb425
parentb95212d7add6b1dcccd08368b6c14df3a2593339
parentb9b4d0f75f4d5844b88e7d3bc33baae6a1e6ec4d
fix conflict
18 files changed:
account/builder.go
account/builder_test.go
api/query.go
api/wallet.go
blockchain/query/annotated.go
blockchain/txbuilder/txbuilder.go
blockchain/txbuilder/txbuilder_test.go
protocol/validation/test/tx_ugly_test.go
protocol/vm/vmutil/script.go
protocol/vm/vmutil/script_test.go
test/bench_blockchain_test.go
test/tx_test_util.go
test/util.go
test/wallet_test_util.go
wallet/recovery.go
wallet/recovery_test.go
wallet/unconfirmed_test.go
wallet/wallet_test.go