Fix conflict related to LfsFileLock block

a9fbbe82 · Rubén Dávila · 84548ab3 · a9fbbe82
Commit a9fbbe82 authored Apr 20, 2018 by Rubén Dávila
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

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

No files found.
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -565,7 +565,6 @@ ProjectCustomAttribute:
 - project_id
 - key
 - value
-<<<<<<< HEAD
 PrometheusMetric:
 - id
 - created_at
@@ -577,14 +576,6 @@ PrometheusMetric:
 - title
 - query
 - group
-LfsFileLock:
- id
- path
- user_id
- project_id
- created_at
-=======
->>>>>>> upstream/master
 Badge:
 - id
 - link_url