diff options
Diffstat (limited to 'changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml')
| -rw-r--r-- | changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml b/changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml new file mode 100644 index 00000000000..2c819d7485d --- /dev/null +++ b/changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml @@ -0,0 +1,5 @@ +--- +title: Fix merge conflict button text if "None" code style selected +merge_request: 44427 +author: David Barr @davebarr +type: fixed |