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

e242ce30 · Bob Van Landuyt · a40272f4 · e242ce30
Commit e242ce30 authored Oct 10, 2017 by Bob Van Landuyt
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
@@ -298,10 +298,7 @@ project:
 - source_pipelines
 - sourced_pipelines
 - members_and_requesters
-<<<<<<< HEAD
-=======
 - build_trace_section_names
->>>>>>> ce-com/master
 - root_of_fork_network
 - fork_network_member
 - fork_network