Resolve conflicts in app/views/shared/boards/_show.html.haml and...

Resolve conflicts in app/views/shared/boards/_show.html.haml and app/views/shared/boards/components/_board.html.haml
Signed-off-by: Rémy Coutable <remy@rymai.me>

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

@@ -2,15 +2,9 @@
 - group = local_assigns.fetch(:group, false)
 - @no_breadcrumb_container = true
 - @no_container = true
-<<<<<<< HEAD
 - @content_class = "issue-boards-content js-focus-mode-board"
-- breadcrumb_title "Issue Boards"
-- page_title "Boards"
-=======
-- @content_class = "issue-boards-content"
-- breadcrumb_title _("Issue Board")
+- breadcrumb_title _("Issue Boards")
 - page_title _("Boards")
->>>>>>> upstream/master
 
 - content_for :page_specific_javascripts do
 

app/views/shared/boards/components/_board.html.haml

@@ -30,11 +30,7 @@
           %board-delete{ "inline-template" => true,
             ":list" => "list",
             "v-if" => "!list.preset && list.id" }
-<<<<<<< HEAD
-            %button.board-delete.has-tooltip.append-right-10{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
-=======
-            %button.board-delete.has-tooltip.float-right{ type: "button", title: _("Delete list"), "aria-label" => _("Delete list"), data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
->>>>>>> upstream/master
+            %button.board-delete.has-tooltip.append-right-10{ type: "button", title: _("Delete list"), "aria-label" => _("Delete list"), data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
               = icon("trash")
         .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"' }
           %span.issue-count-badge-count.float-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }