aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-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