diff options
Diffstat (limited to 'app/manifest.json')
-rw-r--r-- | app/manifest.json | 4 |
1 files changed, 4 insertions, 0 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 |