df4fca9b8f
## Description ConflictInfo was showing up along side discard button. Moved it to a row of its own. Fixes #15113 ## Type of change - Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes |
||
|---|---|---|
| .. | ||
| cypress | ||
| docker | ||
| generators | ||
| patches | ||
| perf | ||
| public | ||
| src | ||
| test | ||
| typings | ||
| .babelrc | ||
| .dockerignore | ||
| .editorconfig | ||
| .eslintrc.json | ||
| .flowconfig | ||
| .gitignore | ||
| .huskyrc | ||
| .lintstagedrc | ||
| .nvmrc | ||
| .prettierignore | ||
| .prettierrc | ||
| .sentryclirc | ||
| build.sh | ||
| craco.build.config.js | ||
| craco.common.config.js | ||
| craco.dev.config.js | ||
| cypress_fat.json | ||
| cypress.env.json | ||
| cypress.json | ||
| Dockerfile | ||
| gitbook-algolia-lambda.js | ||
| index.tsx | ||
| jest.config.js | ||
| netlify.toml | ||
| package.json | ||
| postcss.config.js | ||
| README.md | ||
| README.old.md | ||
| start-https.sh | ||
| stats.json | ||
| tailwind.config.js | ||
| tsconfig.json | ||
| tsconfig.path.json | ||
| vercel.json | ||
| yarn.lock | ||
Appsmith Client
This project was bootstrapped with Create React App.
For details on setting up your development machine, please refer to the Setup Guide