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

app/views/admin/application_settings/show.html.haml

@@ -321,7 +321,6 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
-<<<<<<< HEAD
       = _('Configure push and pull mirrors.')
   .settings-content
     = render partial: 'repository_mirrors_form'
@@ -374,8 +373,3 @@
         = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
     .settings-content
       = render partial: 'slack'
-=======
-      = _('Configure push mirrors.')
-  .settings-content
-    = render partial: 'repository_mirrors_form'
->>>>>>> upstream/master