summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/gl-button-resolve-conflict.yml
diff options
context:
space:
mode:
Diffstat (limited to 'changelogs/unreleased/gl-button-resolve-conflict.yml')
-rw-r--r--changelogs/unreleased/gl-button-resolve-conflict.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/gl-button-resolve-conflict.yml b/changelogs/unreleased/gl-button-resolve-conflict.yml
new file mode 100644
index 00000000000..83886355e22
--- /dev/null
+++ b/changelogs/unreleased/gl-button-resolve-conflict.yml
@@ -0,0 +1,5 @@
+---
+title: Apply new GitLab UI for buttons in MR resolve conflicts page
+merge_request: 52783
+author: Yogi (@yo)
+type: other