Resolve conflict in changelogs/unreleased/39880-merge-method-api.yml

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in changelogs/unreleased/39880-merge-method-api.yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
8c455270 · Rémy Coutable · 8cc7570f · 8c455270
Commit 8c455270 authored Apr 04, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

changelogs/unreleased/39880-merge-method-api.yml changelogs/unreleased/39880-merge-method-api.yml +0 -4

No files found.
--- a/changelogs/unreleased/39880-merge-method-api.yml
+++ b/changelogs/unreleased/39880-merge-method-api.yml
 ---
 title: 'API: Add parameter merge_method to projects'
-<<<<<<< HEAD
-merge_request:
-=======
 merge_request: 18031
->>>>>>> upstream/master
 author: Jan Beckmann
 type: added