ing

2021-05-31 14:33:08 +08:00
parent 3c3d846962
commit 50a61ece7a
5 changed files with 27 additions and 7 deletions
--- a/configAdapter.js
+++ b/configAdapter.js
@@ -5,10 +5,8 @@ const { KOVAN_CONFIG } = require("./config/kovan-config");
 const { MBTEST_CONFIG } = require("./config/mbtest-config");
 const { MBTESTNET_CONFIG } = require("./config/mbtestnet-config");
 const { MATIC_CONFIG } = require("./config/matic-config");
-<<<<<<< HEAD
 const { ARB_CONFIG } = require("./config/arb-config");
-=======
->>>>>>> update drops test
+const { ARB_CONFIG } = require("./config/arb-config");
 const { RINKEBY_CONFIG } = require("./config/rinkeby-config");

 exports.GetConfig = function (network, accounts) {