correct merge error

tamasblummer · tamasblummer · commit 4569d1ce75a8 · 2018-03-13T21:20:59.000+01:00
diff --git a/src/chain/bitcoincorerpcchain.rs b/src/chain/bitcoincorerpcchain.rs
@@ -1,3 +1,5 @@
+use std::error::Error;
+use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::blockdata::script::Script;
 use bitcoin::blockdata::block::{Block, BlockHeader};
 use bitcoin::util::hash::Sha256dHash;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+use std::error::Error;`
	`2`	`+use bitcoin::blockdata::transaction::Transaction;`
`1`	`3`	`use bitcoin::blockdata::script::Script;`
`2`	`4`	`use bitcoin::blockdata::block::{Block, BlockHeader};`
`3`	`5`	`use bitcoin::util::hash::Sha256dHash;`