BACKPORT-CONFLICT

paritytech · Dec 9, 2024 · ee875bf · ee875bf
1 parent ed1932e
commit ee875bf
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/polkadot/node/network/collator-protocol/src/error.rs b/polkadot/node/network/collator-protocol/src/error.rs
@@ -102,7 +102,15 @@ impl SecondingError {
 			self,
 			PersistedValidationDataMismatch |
 				CandidateHashMismatch |
+<<<<<<< HEAD
 				Duplicate | ParentHeadDataMismatch
+=======
+				RelayParentMismatch |
+				ParentHeadDataMismatch |
+				InvalidCoreIndex(_, _) |
+				InvalidSessionIndex(_, _) |
+				InvalidReceiptVersion(_)
+>>>>>>> 5e0bcb0 (Let's be a bit less strict here. (#6662))
 		)
 	}
 }