Merge branch 'master' into devel

5 years ago · 154d78d63e
parent 061822b1d4 507bda0883
commit 154d78d63e
1 changed files with 4 additions and 0 deletions
--- a/html/js/config.js
+++ b/html/js/config.js
@ -1,4 +1,8 @@
 var config = {
+<<<<<<< HEAD
+=======
+    //apiUrl: "http://0.0.0.0:1984/",
+>>>>>>> master
    apiUrl: "http://127.0.0.1:1984/",
    mainnetExplorerUrl: "https://xmrchain.com/",
    testnetExplorerUrl: "https://testnet.xmrchain.com/",