fix mr conflict changes

ten-protocol · Sep 25, 2023 · fc2c391 · fc2c391
1 parent 3b5095d
commit fc2c391
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/tools/walletextension/api/staticOG/javascript.js b/tools/walletextension/api/staticOG/javascript.js
@@ -45,11 +45,7 @@ async function addNetworkToMetaMask(ethereum, userID, chainIDDecimal) {
                         decimals: 18
                     },
                     rpcUrls: [obscuroGatewayAddress+"/"+obscuroGatewayVersion+'/?u='+userID],
-<<<<<<< HEAD
-                    blockExplorerUrls: null
-=======
                     blockExplorerUrls: ['https://testnet.obscuroscan.io'],
->>>>>>> 5ac5482f (Match network configuration with Chainlist)
                 },
             ],
         });
@@ -317,8 +313,5 @@ const initialize = async () => {
 
 }
 
-<<<<<<< HEAD
 window.addEventListener(eventDomLoaded, checkIfMetamaskIsLoaded);
-=======
-window.addEventListener(eventDomLoaded, initialize);
->>>>>>> 5ac5482f (Match network configuration with Chainlist)
+