From 7208f9f95c2f72ec2b8160d346333f82a9d49a84 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 18 Jun 2016 15:12:13 +0200 Subject: [PATCH] Unsaved file. Duh. --- sync/src/chain.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sync/src/chain.rs b/sync/src/chain.rs index 021d8542a..3df478f9f 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -458,21 +458,12 @@ impl ChainSync { // Disable the peer for this syncing round if it gives invalid chain if !valid_response { trace!(target: "sync", "{} Deactivated for invalid headers response", peer_id); -<<<<<<< HEAD self.deactivate_peer(io, peer_id); } if headers.is_empty() && self.state == SyncState::ChainHead { // Peer does not have any new subchain heads, deactivate it nd try with another trace!(target: "sync", "{} Deactivated for no data", peer_id); self.deactivate_peer(io, peer_id); -======= - self.deactivate_peer(io, peer_id); - } - if headers.is_empty() { - // Peer does not have any new subchain heads, deactivate it nd try with another - trace!(target: "sync", "{} Deactivated for no data", peer_id); - self.deactivate_peer(io, peer_id); ->>>>>>> master } match self.state { SyncState::ChainHead => {