Fix conflict in app/views/shared/boards/_show.html.haml

c543b61c · Clement Ho · fbd30b07 · c543b61c
Commit c543b61c authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/shared/boards/_show.html.haml app/views/shared/boards/_show.html.haml +0 -4

No files found.
--- a/app/views/shared/boards/_show.html.haml
+++ b/app/views/shared/boards/_show.html.haml
@@ -15,11 +15,7 @@

 #board-app.boards-app{ "v-cloak" => true, data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" }
  .d-none.d-sm-none.d-md-block
-<<<<<<< HEAD
    = render 'shared/issuable/search_bar', type: :boards, board: board
-=======
-    = render 'shared/issuable/search_bar', type: :boards
->>>>>>> gitlab-ce/master

  .boards-list
    .boards-app-loading.text-center{ "v-if" => "loading" }