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

5b1130bf · Douglas Barbosa Alexandre · 6dcdf071 · 5b1130bf
Commit 5b1130bf authored Dec 12, 2016 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

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

No files found.
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -197,7 +197,6 @@ project:
 - project_feature
 - authorized_users
 - project_authorizations
-<<<<<<< HEAD
 - mirror_user
 - push_rule
 - jenkins_service