resolve one more conflict

smartcontractkit · Jan 8, 2025 · 734581a · 734581a
1 parent a3492fc
commit 734581a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
@@ -1370,11 +1370,7 @@ func TestConfig_Validate(t *testing.T) {
 		- 2: 5 errors:
 			- ChainType: invalid value (Arbitrum): only "optimismBedrock" can be used with this chain id
 			- Nodes: missing: must have at least one node
-<<<<<<< HEAD
-			- ChainType: invalid value (Arbitrum): must be one of arbitrum, astar, celo, gnosis, hedera, kroma, mantle, metis, optimismBedrock, scroll, wemix, xlayer, zkevm, zksync or omitted
-=======
 			- ChainType: invalid value (Arbitrum): must be one of arbitrum, astar, celo, gnosis, hedera, kroma, mantle, metis, optimismBedrock, sei, scroll, wemix, xlayer, zkevm, zksync, zircuit or omitted
->>>>>>> 7debe85cc4 (BCFR-1099 sei custom log index (#15858))
 			- FinalityDepth: invalid value (0): must be greater than or equal to 1
 			- MinIncomingConfirmations: invalid value (0): must be greater than or equal to 1
 		- 3: 3 errors: