Commit 1854f24b authored by Jan Provaznik's avatar Jan Provaznik

Fix import/export conflict

parent 5258f9cb
......@@ -125,10 +125,7 @@ excluded_attributes:
- :mirror_overwrites_diverged_branches
- :description_html
- :repository_languages
<<<<<<< HEAD
- :packages_enabled
=======
>>>>>>> upstream/master
prometheus_metrics:
- :common
- :identifier
......
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