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 |
||
|---|---|---|
| .. | ||
| client | ||
| rts | ||
| server | ||
| util | ||
| yarn.lock | ||