Update error.rs

paritytech · Dec 9, 2024 · eb4962b · eb4962b
1 parent ee875bf
commit eb4962b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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))
 		)
 	}
 }