Resolving conflict with spec/lib/gitlab/import_export/all_models.yml

cbfc167e · Ian Baum · 86ca3179 · cbfc167e
Commit cbfc167e authored Feb 07, 2018 by Ian Baum
Hide 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
@@ -320,11 +320,8 @@ push_event_payload:
 issue_assignees:
 - issue
 - assignee
-<<<<<<< HEAD
 epic_issues:
 - issue
 - epic
-=======
->>>>>>> upstream/master
 lfs_file_locks:
 - user