resolved conflict in hardhat.config.js

SigmaGmbH · Sep 29, 2023 · 0d4dc24 · 0d4dc24
1 parent 1afd963
commit 0d4dc24
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/PERC20_interaction/hardhat.config.js b/PERC20_interaction/hardhat.config.js
@@ -6,11 +6,7 @@ module.exports = {
   solidity: "0.8.18",
   networks: {
     swisstronik: {
-<<<<<<< HEAD
       // If you're using local testnet, replace `url` with local json-rpc address
-=======
-      // If you're using local testnet, replace `url` with local json-rpc address 
->>>>>>> 16f446d9da9d7c449eb73ae6d44d3930df14f4a0
       url: "https://json-rpc.testnet.swisstronik.com/",
       accounts: [`0x` + `${process.env.PRIVATE_KEY}`],
     },