Resolve conflicts in lib/gitlab/import_export/import_export.yml

459ce33a · Ash McKenzie · 603135d4 · 459ce33a
Commit 459ce33a authored May 08, 2018 by Ash McKenzie
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
@@ -113,12 +113,9 @@ excluded_attributes:
    - :mirror_trigger_builds
    - :storage_version
    - :remote_mirror_available_overridden
-<<<<<<< HEAD
    - :only_mirror_protected_branches
    - :pull_mirror_available_overridden
    - :mirror_overwrites_diverged_branches
-=======
->>>>>>> upstream/master
    - :description_html
  snippets:
    - :expired_at