From f46e30a4e188acc1617cf6b74610d71700e89dc4 Mon Sep 17 00:00:00 2001
From: rashminagarajp <rashmi.pn@meesho.com>
Date: Mon, 18 May 2020 11:26:27 +0530
Subject: [PATCH] resolved json conflict

---
 app/client/cypress/fixtures/example.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/client/cypress/fixtures/example.json b/app/client/cypress/fixtures/example.json
index 558bef64bc..56e72b7ce2 100644
--- a/app/client/cypress/fixtures/example.json
+++ b/app/client/cypress/fixtures/example.json
@@ -94,9 +94,6 @@
   "RichTextEditorName": "RichtextEditor",
   "HtmlText": "This is the initial<b>content </b> <h1> This is a Heading</h1> <p> This is a paragraph.</p>",
   "RichTexteditorBody": "Here is the text area to edit html",
-<<<<<<< HEAD
-  "userApi": "http://postgrest.appsmith.com:3000"
-=======
-  "validateImage":"https://cdn.dribbble.com/users/1787323/screenshots/4563995/dribbbe_hammer-01.png"
->>>>>>> a14f68630cd57e304e3519b75eff9dc36dfc0bec
+  "userApi": "http://postgrest.appsmith.com:3000",
+  "validateImage": "https://cdn.dribbble.com/users/1787323/screenshots/4563995/dribbbe_hammer-01.png"
 }
\ No newline at end of file