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

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

@@ -2,17 +2,6 @@
   = form_errors(@label)
 
   .form-group.row
-<<<<<<< HEAD
-    = f.label :title, class: 'col-form-label'
-    .col-sm-10
-      = f.text_field :title, class: "form-control", required: true
-  .form-group.row
-    = f.label :description, class: 'col-form-label'
-    .col-sm-10
-      = f.text_field :description, class: "form-control js-quick-submit"
-  .form-group.row
-    = f.label :color, "Background color", class: 'col-form-label'
-=======
     = f.label :title, class: 'col-form-label col-sm-2'
     .col-sm-10
       = f.text_field :title, class: "form-control", required: true
@@ -22,7 +11,6 @@
       = f.text_field :description, class: "form-control js-quick-submit"
   .form-group.row
     = f.label :color, "Background color", class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10
       .input-group
         .input-group-prepend