Fix AllModels YAML conflicts

95abb9a6 · Tiago Botelho · 8f589bdd · 95abb9a6
Commit 95abb9a6 authored May 07, 2018 by Tiago Botelho
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
@@ -308,12 +308,9 @@ project:
 - container_repositories
 - uploads
 - import_state
-<<<<<<< HEAD
 - repository_state
 - source_pipelines
 - sourced_pipelines
-=======
->>>>>>> upstream/master
 - members_and_requesters
 - build_trace_section_names
 - root_of_fork_network