Intergrate ENS with IPFS

7 years ago · 8b8cc94f6f
parent 88a6b4edc7
commit 8b8cc94f6f
2 changed files with 5 additions and 1 deletions
--- a/app/manifest.json
+++ b/app/manifest.json
@ -74,4 +74,8 @@
    ]
  },
  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'"
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> Intergrate ENS with IPFS
--- a/app/scripts/lib/portalnetwork.js
+++ b/app/scripts/lib/portalnetwork.js
@ -33,4 +33,4 @@ module.exports = function (provider) {
        })
        return { cancel: true }
    }, {urls: ["*://*.eth/"]})
-}
+}