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

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

@@ -302,7 +302,6 @@
       = _('Allow requests to the local network from hooks and services.')
   .settings-content
     = render 'outbound'
-<<<<<<< HEAD
 
 -# EE-only
 - if Gitlab::Geo.license_allows?
@@ -364,5 +363,3 @@
         = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
     .settings-content
       = render partial: 'slack'
-=======
->>>>>>> upstream/master