Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

resolved json conflict

Browse Source
This commit is contained in:
rashminagarajp 2020-05-18 11:26:27 +05:30
parent 56414e3d2c
commit f46e30a4e1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/client/cypress/fixtures/example.json
View File

@ -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"
}