Skip to content

G
gitlab-ce
Commit b767eb01 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

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

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 28850bc7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/views/admin/application_settings/show.html.haml
View file @ b767eb01
...@@ -336,10 +336,6 @@ ...@@ -336,10 +336,6 @@
.settings-content .settings-content
= render partial: 'repository_mirrors_form' = render partial: 'repository_mirrors_form'
<<<<<<< HEAD
-# EE-only
=======
>>>>>>> upstream/master
= render_if_exists 'admin/application_settings/geo', expanded: expanded = render_if_exists 'admin/application_settings/geo', expanded: expanded
= render_if_exists 'admin/application_settings/external_authorization_service_form', expanded: expanded = render_if_exists 'admin/application_settings/external_authorization_service_form', expanded: expanded
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7