Skip to content

G
gitlab-ce
Commit fd8e1cf8 authored by Stan Hu's avatar Stan Hu
Browse files
Options

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

parent 1c9ee90e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/admin/application_settings/show.html.haml
View file @ fd8e1cf8
...@@ -302,7 +302,6 @@ ...@@ -302,7 +302,6 @@
= _('Allow requests to the local network from hooks and services.') = _('Allow requests to the local network from hooks and services.')
.settings-content .settings-content
= render 'outbound' = render 'outbound'
<<<<<<< HEAD
-# EE-only -# EE-only
- if Gitlab::Geo.license_allows? - if Gitlab::Geo.license_allows?
...@@ -364,5 +363,3 @@ ...@@ -364,5 +363,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'
=======
>>>>>>> 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7