summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2019-08-21 14:37:28 -0500
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-21 14:37:28 -0500
commitb59b31688f3f4dde4c80ead785ed6789be163af1 (patch)
tree1a237a3a0ebbc79813f25a98f0bf7f95ca325536
parent0017b48dcef60d65d3cdc37dd07602fda95206cc (diff)
downloadgitlab-ce-rebase-conflict-message.tar.gz
Fix no newline in changelogrebase-conflict-message
-rw-r--r--changelogs/unreleased/29646.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/changelogs/unreleased/29646.yml b/changelogs/unreleased/29646.yml
index 0ccbf06e589..9d6bf0ae9c1 100644
--- a/changelogs/unreleased/29646.yml
+++ b/changelogs/unreleased/29646.yml
@@ -2,4 +2,4 @@
title: "Improve rebase message to clarify why rebase button is not offered"
merge_request: 29646
author: Ben Bodenmiller
-type: changed \ No newline at end of file
+type: changed