fix: resolve conflict

axieinfinity · Mar 25, 2024 · 4f931c4 · 4f931c4
1 parent 72bd41c
commit 4f931c4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/script/Migration.s.sol b/script/Migration.s.sol
@@ -116,10 +116,7 @@ abstract contract Migration is BaseMigration {
 
       // RNSDomainPrice
       param.rnsDomainPrice.admin = temporaryAdmin;
-<<<<<<< HEAD
       param.rnsDomainPrice.overrider = duke;
-=======
->>>>>>> feature/script
       param.rnsDomainPrice.domainPriceOperators = _toSingletonArray(operator);
       param.rnsDomainPrice.renewalFees = new INSDomainPrice.RenewalFee[](4);
       param.rnsDomainPrice.renewalFees[0] = INSDomainPrice.RenewalFee(5, uint256(5e18) / 365 days);