summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/sh-fix-resolve-button-not-available.yml
diff options
context:
space:
mode:
Diffstat (limited to 'changelogs/unreleased/sh-fix-resolve-button-not-available.yml')
-rw-r--r--changelogs/unreleased/sh-fix-resolve-button-not-available.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/changelogs/unreleased/sh-fix-resolve-button-not-available.yml b/changelogs/unreleased/sh-fix-resolve-button-not-available.yml
deleted file mode 100644
index 85a9007f570..00000000000
--- a/changelogs/unreleased/sh-fix-resolve-button-not-available.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix "Resolve conflicts" button not appearing for some users
-merge_request: 29535
-author:
-type: fixed