Resolve changelogs/unreleased/6010_remove_gemnasium_service.yml

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

Resolve changelogs/unreleased/6010_remove_gemnasium_service.yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
809288df · Rémy Coutable · bc059221 · 809288df
Commit 809288df authored Aug 21, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

changelogs/unreleased/6010_remove_gemnasium_service.yml changelogs/unreleased/6010_remove_gemnasium_service.yml +0 -4

No files found.
--- a/changelogs/unreleased/6010_remove_gemnasium_service.yml
+++ b/changelogs/unreleased/6010_remove_gemnasium_service.yml
 ---
 title: Remove Gemnasium service
-<<<<<<< HEAD
-merge_request:
-=======
 merge_request: 21185
->>>>>>> upstream/master
 author:
 type: removed