resolve app/views/shared/issuable/_sidebar.html.haml

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

 %aside.right-sidebar{ class: sidebar_gutter_collapsed_class }
   .issuable-sidebar
     .block
-<<<<<<< HEAD
-      %span.issuable-count.pull-left.hide-collapsed
-=======
       %span.issuable-count.hide-collapsed.pull-left
->>>>>>> 204a9895333178cc90b40ef365ad566d750fa594
         = issuable.iid
         of
         = issuables_count(issuable)
       %span.pull-right
         %a.gutter-toggle{href: '#'}
           = sidebar_gutter_toggle_icon
-<<<<<<< HEAD
-      .issuable-nav.pull-right.btn-group.hide-collapsed{role: 'group', "aria-label" => '...'}
-=======
       .issuable-nav.hide-collapsed.pull-right.btn-group{role: 'group', "aria-label" => '...'}
->>>>>>> 204a9895333178cc90b40ef365ad566d750fa594
         - if prev_issuable = prev_issuable_for(issuable)
           = link_to 'Prev', [@project.namespace.becomes(Namespace), @project, prev_issuable], class: 'btn btn-default prev-btn'
         - else