summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml
diff options
context:
space:
mode:
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.yml5
1 files changed, 0 insertions, 5 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
deleted file mode 100644
index 2c819d7485d..00000000000
--- a/changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix merge conflict button text if "None" code style selected
-merge_request: 44427
-author: David Barr @davebarr
-type: fixed