Resolve conflict in `safe_model_attributes.yml`

[skip ci]

Resolve conflict in `safe_model_attributes.yml`
[skip ci]
df179a2d · Bob Van Landuyt · 91112906 · df179a2d
Commit df179a2d authored Mar 23, 2018 by Bob Van Landuyt
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
@@ -474,12 +474,9 @@ Project:
 - merge_requests_ff_only_enabled
 - merge_requests_rebase_enabled
 - jobs_cache_index
-<<<<<<< HEAD
 - external_authorization_classification_label
 - external_webhook_token
-=======
 - pages_https_only
->>>>>>> upstream/master
 Author:
 - name
 ProjectFeature: