Resolve conflicts in app/views/admin/application_settings/_repository_mirrors_form.html.haml

9abf2680 · Ash McKenzie · 75f1b586 · 9abf2680
Commit 9abf2680 authored May 08, 2018 by Ash McKenzie
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/admin/application_settings/_repository_mirrors_form.html.haml ...n/application_settings/_repository_mirrors_form.html.haml +0 -3

No files found.
--- a/app/views/admin/application_settings/_repository_mirrors_form.html.haml
+++ b/app/views/admin/application_settings/_repository_mirrors_form.html.haml
@@ -13,10 +13,7 @@
          If disabled, only admins will be able to setup mirrors in projects.
          = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')

-<<<<<<< HEAD
  - if Gitlab.com? && License.feature_available?(:repository_mirrors)
    = render 'mirror_settings', f: f

-=======
->>>>>>> upstream/master
  = f.submit 'Save changes', class: "btn btn-success"