Commit df179a2d authored by Bob Van Landuyt's avatar Bob Van Landuyt

Resolve conflict in `safe_model_attributes.yml`

[skip ci]
parent 91112906
......@@ -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:
......
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