Resolve conflicts in spec/lib/gitlab/import_export/all_models.yml

952fad90 · Stan Hu · 0d6e9d4e · 952fad90
Commit 952fad90 authored Mar 30, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/lib/gitlab/import_export/all_models.yml spec/lib/gitlab/import_export/all_models.yml +0 -3

No files found.
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -18,11 +18,8 @@ issues:
 - metrics
 - timelogs
 - issue_assignees
-<<<<<<< HEAD
 - epic_issue
 - epic
-=======
->>>>>>> upstream/master
 - closed_by
 events:
 - author