Update safe_model_attributes.yml

f99ef077 · Shinya Maeda · 0bdf082f · f99ef077
Commit f99ef077 authored Sep 05, 2017 by Shinya Maeda
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
@@ -284,10 +284,7 @@ CommitStatus:
 - auto_canceled_by_id
 - retried
 - protected
-<<<<<<< HEAD
-=======
 - failure_reason
->>>>>>> ce-com/master
 Ci::Variable:
 - id
 - project_id