Resolve lib/gitlab/import_export/import_export.yml

210722b6 · Robert Speicher · 88c5db4e · 210722b6
Commit 210722b6 authored Dec 06, 2018 by Robert Speicher
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
@@ -123,12 +123,9 @@ excluded_attributes:
    - :mirror_overwrites_diverged_branches
    - :description_html
    - :repository_languages
-<<<<<<< HEAD
    - :packages_enabled
    - :mirror_last_update_at
    - :mirror_last_successful_update_at
-=======
->>>>>>> upstream/master
    - :bfg_object_map
  namespaces:
    - :runners_token