Fix conflict in app/views/shared/_service_settings.html.haml

app/views/shared/_service_settings.html.haml

@@ -9,21 +9,13 @@
 .service-settings
   - if @service.show_active_box?
     .form-group.row
-<<<<<<< HEAD
-      = form.label :active, "Active", class: "col-form-label"
-=======
       = form.label :active, "Active", class: "col-form-label col-sm-2"
->>>>>>> gitlab-ce/master
       .col-sm-10
         = form.check_box :active, disabled: disable_fields_service?(@service)
 
   - if @service.configurable_events.present?
     .form-group.row
-<<<<<<< HEAD
-      = form.label :url, "Trigger", class: 'col-form-label'
-=======
       = form.label :url, "Trigger", class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
 
       .col-sm-10
         - @service.configurable_events.each do |event|