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

app/views/shared/_label.html.haml

@@ -9,11 +9,7 @@
 %li.label-list-item{ id: label_css_id, data: { id: label.id } }
   = render "shared/label_row", label: label
 
-<<<<<<< HEAD
-  .d-inline-block.d-sm-inline-block.d-md-none.dropdown
-=======
   .d-inline-block.d-sm-none.dropdown
->>>>>>> gitlab-ce/master
     %button.btn.btn-default.label-options-toggle{ type: 'button', data: { toggle: "dropdown" } }
       Options
       = icon('caret-down')