From 61f1699c0eea4fd8b345d2a5f0f8680aed256e7d Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Wed, 30 Nov 2016 13:39:28 +0000
Subject: [PATCH] fix merge

---
 sync/src/chain.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 609055422..e8c9afb37 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -1419,14 +1419,9 @@ impl ChainSync {
 
 	/// Send Status message
 	fn send_status(&mut self, io: &mut SyncIo, peer: PeerId) -> Result<(), NetworkError> {
-<<<<<<< HEAD
 		let warp_protocol_version = io.protocol_version(&WARP_SYNC_PROTOCOL_ID, peer);
 		let warp_protocol = warp_protocol_version != 0;
 		let protocol = if warp_protocol { warp_protocol_version } else { PROTOCOL_VERSION_63 };
-=======
-		let warp_protocol = io.protocol_version(&WARP_SYNC_PROTOCOL_ID, peer) != 0;
-		let protocol = if warp_protocol { PROTOCOL_VERSION_1 } else { io.eth_protocol_version(peer) };
->>>>>>> master
 		trace!(target: "sync", "Sending status to {}, protocol version {}", peer, protocol);
 		let mut packet = RlpStream::new_list(if warp_protocol { 7 } else { 5 });
 		let chain = io.chain().chain_info();