Fixed missing import/export conflict

3498fb1f · Jan Provaznik · 3eded763 · 3498fb1f
Commit 3498fb1f authored Sep 07, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/lib/gitlab/import_export/safe_model_attributes.yml spec/lib/gitlab/import_export/safe_model_attributes.yml +0 -3

No files found.
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -613,7 +613,6 @@ Badge:
 - type
 ProjectCiCdSetting:
 - group_runners_enabled
-<<<<<<< HEAD
 ProtectedEnvironment:
 - id
 - project_id
@@ -628,8 +627,6 @@ ProtectedEnvironment::DeployAccessLevel:
 - updated_at
 - user_id
 - group_id
-=======
->>>>>>> upstream/master
 ResourceLabelEvent:
 - id
 - action