summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml
diff options
context:
space:
mode:
Diffstat (limited to 'changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml')
-rw-r--r--changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml b/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml
deleted file mode 100644
index 574c322803c..00000000000
--- a/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Improve visibility of "Resolve conflicts" and "Merge locally" actions
-merge_request: 8229
-author: