Fixing merge conflicts when cherry picking

This commit is contained in:
Arpit Mohan 2020-10-29 16:05:37 +05:30
parent 862a310050
commit 12c874cca7

View File

@ -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)