From eb4962b8be4b4db0cc7eef488b07a0785ddcb487 Mon Sep 17 00:00:00 2001
From: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:01:03 +0200
Subject: [PATCH] Update error.rs

---
 polkadot/node/network/collator-protocol/src/error.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/polkadot/node/network/collator-protocol/src/error.rs b/polkadot/node/network/collator-protocol/src/error.rs
index 271448915ea9..a0785b135a62 100644
--- a/polkadot/node/network/collator-protocol/src/error.rs
+++ b/polkadot/node/network/collator-protocol/src/error.rs
@@ -102,15 +102,11 @@ impl SecondingError {
 			self,
 			PersistedValidationDataMismatch |
 				CandidateHashMismatch |
-<<<<<<< HEAD
-				Duplicate | ParentHeadDataMismatch
-=======
 				RelayParentMismatch |
 				ParentHeadDataMismatch |
 				InvalidCoreIndex(_, _) |
 				InvalidSessionIndex(_, _) |
 				InvalidReceiptVersion(_)
->>>>>>> 5e0bcb0 (Let's be a bit less strict here. (#6662))
 		)
 	}
 }