Fix conflict in app/views/admin/broadcast_messages/_form.html.haml

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

@@ -10,11 +10,7 @@
   = form_errors(@broadcast_message)
 
   .form-group.row
-<<<<<<< HEAD
-    = f.label :message, class: 'col-form-label'
-=======
     = f.label :message, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10
       = f.text_area :message, class: "form-control js-autosize",
         required: true,
@@ -31,19 +27,11 @@
     .col-sm-10
       = f.color_field :font, class: "form-control"
   .form-group.row
-<<<<<<< HEAD
-    = f.label :starts_at, _("Starts at (UTC)"), class: 'col-form-label'
-    .col-sm-10.datetime-controls
-      = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline'
-  .form-group.row
-    = f.label :ends_at, _("Ends at (UTC)"), class: 'col-form-label'
-=======
     = f.label :starts_at, _("Starts at (UTC)"), class: 'col-form-label col-sm-2'
     .col-sm-10.datetime-controls
       = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline'
   .form-group.row
     = f.label :ends_at, _("Ends at (UTC)"), class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10.datetime-controls
       = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'
   .form-actions