Merge commit 'refs/pull/228/head' of github.com:bitcoindevkit/bdk

author Alekos Filini <alekos.filini@gmail.com>

Tue, 15 Dec 2020 13:33:59 +0000 (14:33 +0100)

committer Alekos Filini <alekos.filini@gmail.com>

Tue, 15 Dec 2020 13:33:59 +0000 (14:33 +0100)
author Alekos Filini <alekos.filini@gmail.com>
Tue, 15 Dec 2020 13:33:59 +0000 (14:33 +0100)
committer Alekos Filini <alekos.filini@gmail.com>
Tue, 15 Dec 2020 13:33:59 +0000 (14:33 +0100)
diff --cc src/error.rs
Simple merge
diff --cc src/wallet/mod.rs
Simple merge
diff --cc src/wallet/tx_builder.rs
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Tue, 15 Dec 2020 13:33:59 +0000 (14:33 +0100)
committer	Alekos Filini <alekos.filini@gmail.com>
	Tue, 15 Dec 2020 13:33:59 +0000 (14:33 +0100)
		1	2
src/error.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/tx_builder.rs	patch \|	diff1 \|	diff2 \|	blob \| history