fixed harhat config

Aaron Roehl · Aaron Roehl · commit 9794e49d0e2e · 2023-04-16T13:09:21.000+02:00
diff --git a/safe-contracts/hardhat.config.ts b/safe-contracts/hardhat.config.ts
@@ -130,11 +130,7 @@ const userConfig: HardhatUserConfig = {
         },
         "shimmerevm-testnet": {
             ...sharedNetworkConfig,
-<<<<<<< Updated upstream
-            url: `${NODE_URL}`,
-=======
             url: `https://json-rpc.evm.testnet.shimmer.network/`,
->>>>>>> Stashed changes
             chainId: 1071,
             // gasPrice: "auto",
         },
