From 12c874cca723a88e7206797e88db3dd6e3a7b609 Mon Sep 17 00:00:00 2001 From: Arpit Mohan Date: Thu, 29 Oct 2020 16:05:37 +0530 Subject: [PATCH] Fixing merge conflicts when cherry picking --- app/client/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/app/client/README.md b/app/client/README.md index 2a275ea504..0ae785bd51 100755 --- a/app/client/README.md +++ b/app/client/README.md @@ -7,3 +7,4 @@ This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). For details on setting up your development machine, please refer to the [Setup Guide](https://github.com/appsmithorg/appsmith/blob/release/contributions/ClientSetup.md) +