fix conflict

smartcontractkit · Aug 24, 2024 · 160ea54 · 160ea54
1 parent f8d149d
commit 160ea54
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/core/services/relay/evm/write_target.go b/core/services/relay/evm/write_target.go
@@ -52,14 +52,11 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
 		return nil, err
 	}
 
-<<<<<<< HEAD
 	err = cr.Start(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-=======
->>>>>>> develop
 	chainWriterConfig := relayevmtypes.ChainWriterConfig{
 		Contracts: map[string]*relayevmtypes.ContractConfig{
 			"forwarder": {