Update manifest.json

2018-05-24 22:37:41 +07:00 · 2018-05-24 22:37:41 +07:00 · 86ead431c3
parent 8b8cc94f6f
commit 86ead431c3
1 changed files with 0 additions and 4 deletions
--- 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