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

bc397562 · Stan Hu · 00fb56cb · bc397562
Commit bc397562 authored Jul 07, 2018 by Stan Hu
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
@@ -331,10 +331,7 @@ project:
 - settings
 - ci_cd_settings
 - import_export_upload
-<<<<<<< HEAD
 - vulnerability_feedback
-=======
->>>>>>> upstream/master
 award_emoji:
 - awardable
 - user