Resolve application settings UI conflicts after ce-to-ee merge

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

@@ -23,12 +23,9 @@
           = f.label :shared_runners_enabled do
             = f.check_box :shared_runners_enabled
             Enable shared runners for new projects
-<<<<<<< HEAD
 
     = render 'shared_runners_minutes_setting', form: f
 
-=======
->>>>>>> upstream/master
     .form-group
       = f.label :shared_runners_text, class: 'control-label col-sm-2'
       .col-sm-10

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

 = form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
   = form_errors(@application_setting)
 
-<<<<<<< HEAD
   - if License.feature_available?(:repository_mirrors)
     = render partial: 'repository_mirrors_form', locals: { f: f }
 
-=======
->>>>>>> upstream/master
   - if Gitlab.config.registry.enabled
     %fieldset
       %legend Container Registry