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

b51814a6 · Clement Ho · 3c14be67 · b51814a6
Commit b51814a6 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/shared/_label.html.haml app/views/shared/_label.html.haml +0 -4

No files found.
--- a/app/views/shared/_label.html.haml
+++ b/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')