aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMikeCheng1208 <a3804430@hotmail.com>2018-05-04 19:57:19 +0800
committerYung chieh Tsai <x01ep23i@hotmail.com>2018-05-29 12:38:32 +0800
commit8b8cc94f6f8cb949ee214e814d9d8949d17ddd16 (patch)
treedbcf5a360a01f5f28f72754874eb91d528e5e03f /app
parent88a6b4edc79a27e9d94dc4ec25e9de02153abc5d (diff)
downloadtangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar
tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.gz
tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.bz2
tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.lz
tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.xz
tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.tar.zst
tangerine-wallet-browser-8b8cc94f6f8cb949ee214e814d9d8949d17ddd16.zip
Intergrate ENS with IPFS
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json4
-rw-r--r--app/scripts/lib/portalnetwork.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/manifest.json b/app/manifest.json
index 0f5a2566f..ad500e40a 100644
--- 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
diff --git a/app/scripts/lib/portalnetwork.js b/app/scripts/lib/portalnetwork.js
index 960871ebc..977f17926 100644
--- 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/"]})
-} \ No newline at end of file
+}