Skip to content

G
gitlab-ce
Commit a9fbbe82 authored by Rubén Dávila's avatar Rubén Dávila
Browse files
Options

Fix conflict related to LfsFileLock block

parent 84548ab3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @ a9fbbe82
...@@ -565,7 +565,6 @@ ProjectCustomAttribute: ...@@ -565,7 +565,6 @@ ProjectCustomAttribute:
- project_id - project_id
- key - key
- value - value
<<<<<<< HEAD
PrometheusMetric: PrometheusMetric:
- id - id
- created_at - created_at
...@@ -577,14 +576,6 @@ PrometheusMetric: ...@@ -577,14 +576,6 @@ PrometheusMetric:
- title - title
- query - query
- group - group
LfsFileLock:
- id
- path
- user_id
- project_id
- created_at
=======
>>>>>>> upstream/master
Badge: Badge:
- id - id
- link_url - link_url
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7