Fix import/export conflict

1854f24b · Jan Provaznik · 5258f9cb · 1854f24b
Commit 1854f24b authored Sep 07, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/import_export/import_export.yml lib/gitlab/import_export/import_export.yml +0 -3

No files found.
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -125,10 +125,7 @@ excluded_attributes:
    - :mirror_overwrites_diverged_branches
    - :description_html
    - :repository_languages
-<<<<<<< HEAD
    - :packages_enabled
-=======
->>>>>>> upstream/master
  prometheus_metrics:
    - :common
    - :identifier