Commit 9a14ed50 authored by Ash McKenzie's avatar Ash McKenzie

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

parent 9abf2680
...@@ -321,7 +321,6 @@ ...@@ -321,7 +321,6 @@
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
<<<<<<< HEAD
= _('Configure push and pull mirrors.') = _('Configure push and pull mirrors.')
.settings-content .settings-content
= render partial: 'repository_mirrors_form' = render partial: 'repository_mirrors_form'
...@@ -374,8 +373,3 @@ ...@@ -374,8 +373,3 @@
= _('Geo allows you to replicate your GitLab instance to other geographical locations.') = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
.settings-content .settings-content
= render partial: 'slack' = render partial: 'slack'
=======
= _('Configure push mirrors.')
.settings-content
= render partial: 'repository_mirrors_form'
>>>>>>> upstream/master
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment