fix conflict in main deploy json file

BendDAO · Jul 26, 2023 · e0f3d4e · e0f3d4e
1 parent ca10730
commit e0f3d4e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/deployments/deployed-contracts-main.json b/deployments/deployed-contracts-main.json
@@ -141,16 +141,15 @@
     "address": "0x8B8BefFDf3aC2C32aF746DaFaE49E085f4D07267",
     "deployer": "0x868964fa49a6fd6e116FE82c8f4165904406f479"
   },
-<<<<<<< HEAD
   "ChainlinkAggregatorHelperImpl": {
     "address": "0x4E840EcC421016c132E8515353c5Ee2Fe162D8a8"
   },
   "ChainlinkAggregatorHelper": {
     "address": "0xDcdE2dBd52B493de0b2C6Ff707562eEf7C3C7706",
-=======
+    "deployer": "0x868964fa49a6fd6e116FE82c8f4165904406f479"
+  },
   "rateStrategyWETH230724": {
     "address": "0x746F1ff42618b99Dfc9Bc941249B7f98b0011049",
->>>>>>> eaf3527 (deploy new interest rate for eth according bip39)
     "deployer": "0x868964fa49a6fd6e116FE82c8f4165904406f479"
   }
 }