OSDN Git Service

fix conflicts wallet-store-interface-unmarshal
authorChengcheng Zhang <943420582@qq.com>
Thu, 4 Jul 2019 13:10:54 +0000 (21:10 +0800)
committerChengcheng Zhang <943420582@qq.com>
Thu, 4 Jul 2019 13:10:54 +0000 (21:10 +0800)
commitdb398f2ee1db8be24ed6e246f5577da6252e668d
tree10fc878b279cfc96b4b71d9186373186e296a20c
parent8723f30276880b62dd3c7985dcbfee3b059e3c26
parentf30b7541256e6a7f6f875994cb08edf3bddab93c
fix conflicts
test/accounts_test.go
wallet/utxo_test.go