Fix conflicts in views

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/boards/_show.html.haml

@@ -15,11 +15,7 @@
 = render "projects/issues/head"
 
 .hidden-xs.hidden-sm
-<<<<<<< HEAD
   = render 'shared/issuable/search_bar', type: :boards, board: board
-=======
-  = render 'shared/issuable/search_bar', type: :boards
->>>>>>> ce/master
 
 #board-app.boards-app{ "v-cloak" => true, data: board_data }
   .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }

app/views/shared/issuable/_search_bar.html.haml

@@ -90,7 +90,7 @@
                   %span.dropdown-label-box{ style: 'background: {{color}}' }
                   %span.label-title.js-data-value
                     {{title}}
-<<<<<<< HEAD
+
           - if type == :issues || type == :boards
             #js-dropdown-weight.dropdown-menu{ data: { icon: 'balance-scale', hint: 'weight', tag: 'weight' } }
               %ul{ 'data-dropdown' => true }
@@ -106,8 +106,6 @@
                   %li.filter-dropdown-item{ 'data-value' => "#{weight}" }
                     %button.btn.btn-link= weight
 
-=======
->>>>>>> ce/master
         .filter-dropdown-container
           - if type == :boards
             - if can?(current_user, :admin_list, @project)