Resolve 44596-double-title-merge-request-message.yml

d572b194 · Lin Jen-Shin · b3b8e94f · d572b194
Commit d572b194 authored Sep 17, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

changelogs/unreleased/44596-double-title-merge-request-message.yml ...s/unreleased/44596-double-title-merge-request-message.yml +0 -4

No files found.
--- a/changelogs/unreleased/44596-double-title-merge-request-message.yml
+++ b/changelogs/unreleased/44596-double-title-merge-request-message.yml
 ---
 title: Fix double title in merge request chat messages.
-<<<<<<< HEAD
-merge_request:
-=======
 merge_request: 21670
->>>>>>> upstream/master
 author: Kukovskii Vladimir
 type: fixed