Fix typo

smartcontractkit · Nov 7, 2023 · 00ea38b · 00ea38b
1 parent e782b1e
commit 00ea38b
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/integration-tests/contracts/contract_deployer.go b/integration-tests/contracts/contract_deployer.go
@@ -169,20 +169,14 @@ func NewContractDeployer(bcClient blockchain.EVMClient, logger zerolog.Logger) (
 		return &ScrollContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil
 	case *blockchain.PolygonZkEvmClient:
 		return &PolygonZkEvmContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil
-<<<<<<< HEAD
 	case *blockchain.LineaClient:
 		return &LineaContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil
 	case *blockchain.FantomClient:
 		return &FantomContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil
-<<<<<<< HEAD
 	case *blockchain.KromaClient:
 		return &KromaContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil
-=======
-=======
 	case *blockchain.WeMixClient:
 		return &WeMixContractDeployer{NewEthereumContractDeployer(clientImpl, logger)}, nil
->>>>>>> 4b069998f8 (Adds WeMix testnet config)
->>>>>>> 673b7a894b (Adds WeMix testnet config)
 	}
 	return nil, errors.New("unknown blockchain client implementation for contract deployer, register blockchain client in NewContractDeployer")
 }