From 86ead431c3e07eff3ff9deae42ab0994ca998229 Mon Sep 17 00:00:00 2001 From: Yung chieh Tsai Date: Thu, 24 May 2018 22:37:41 +0700 Subject: [PATCH] Update manifest.json --- app/manifest.json | 4 ---- 1 file changed, 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