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

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

@@ -336,10 +336,6 @@
   .settings-content
     = 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/external_authorization_service_form', expanded: expanded