Resolve changelogs/unreleased/wip-new-mr-cmd.yml

20555f54 · Lin Jen-Shin · f8b8ab51 · 20555f54
Commit 20555f54 authored Mar 06, 2018 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

changelogs/unreleased/wip-new-mr-cmd.yml changelogs/unreleased/wip-new-mr-cmd.yml +0 -3

No files found.
--- a/changelogs/unreleased/wip-new-mr-cmd.yml
+++ b/changelogs/unreleased/wip-new-mr-cmd.yml
-<<<<<<< HEAD
 ---
-=======
->>>>>>> upstream/master
 title: Port /wip quick action command to Merge Request creation (on description)
 merge_request: 17463
 author: Adam Pahlevi