From 314ced57c8b9ccd9520c6dd1d65919176d56bf24 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Tue, 19 Apr 2016 16:20:04 +0200
Subject: [PATCH] fixed transaction queue merge conflict

---
 miner/src/transaction_queue.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/miner/src/transaction_queue.rs b/miner/src/transaction_queue.rs
index ac7fa5e8e..ce09b2078 100644
--- a/miner/src/transaction_queue.rs
+++ b/miner/src/transaction_queue.rs
@@ -1220,7 +1220,7 @@ mod test {
 	#[test]
 	fn should_return_correct_nonces_when_dropped_because_of_limit() {
 		// given
-		let mut txq = TransactionQueue::with_limits(2, 2);
+		let mut txq = TransactionQueue::with_limit(2);
 		let tx = new_tx();
 		let (tx1, tx2) = new_txs(U256::one());
 		let sender = tx1.sender().unwrap();