Fix merge conflicts

smartcontractkit · Dec 13, 2024 · 5818469 · 5818469
1 parent 9127dc0
commit 5818469
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/deployment/common/changeset/transfer_to_mcms_with_timelock.go b/deployment/common/changeset/transfer_to_mcms_with_timelock.go
@@ -167,7 +167,7 @@ func TransferToDeployer(e deployment.Environment, cfg TransferToDeployerConfig)
 	if err != nil {
 		return deployment.ChangesetOutput{}, err
 	}
-	tls, err := MaybeLoadMCMSWithTimelockState(e.Chains[cfg.ChainSel], addrs)
+	tls, err := MaybeLoadMCMSWithTimelockChainState(e.Chains[cfg.ChainSel], addrs)
 	if err != nil {
 		return deployment.ChangesetOutput{}, err
 	}