aboutsummaryrefslogtreecommitdiffstats
path: root/app/manifest.json
diff options
context:
space:
mode:
authorYung chieh Tsai <x01ep23i@hotmail.com>2018-05-24 23:37:41 +0800
committerYung chieh Tsai <x01ep23i@hotmail.com>2018-05-29 12:39:10 +0800
commit86ead431c3e07eff3ff9deae42ab0994ca998229 (patch)
treec5b8f35763c8562fd1888c5729442d6c5125fae1 /app/manifest.json
parent8b8cc94f6f8cb949ee214e814d9d8949d17ddd16 (diff)
downloadtangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.tar
tangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.tar.gz
tangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.tar.bz2
tangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.tar.lz
tangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.tar.xz
tangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.tar.zst
tangerine-wallet-browser-86ead431c3e07eff3ff9deae42ab0994ca998229.zip
Update manifest.json
Diffstat (limited to 'app/manifest.json')
-rw-r--r--app/manifest.json4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/manifest.json b/app/manifest.json
index ad500e40a..0f5a2566f 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -74,8 +74,4 @@
]
},
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'"
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> Intergrate ENS with IPFS