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

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

@@ -336,7 +336,6 @@
   .settings-content
     = render partial: 'repository_mirrors_form'
 
-<<<<<<< HEAD
 -# EE-only
 - if Gitlab::Geo.license_allows?
   %section.settings.as-geo.no-animate#js-geo-settings{ class: ('expanded' if expanded) }
@@ -386,8 +385,6 @@
     .settings-content
       = render partial: 'slack'
 
-=======
->>>>>>> upstream/master
 = render_if_exists 'admin/application_settings/templates', expanded: expanded
 
 %section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) }