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

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

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
 - if @issues.to_a.any?
-<<<<<<< HEAD
-  .card.panel-small.card-without-border
-=======
  .card.card-small.card-without-border
->>>>>>> gitlab-ce/master
    %ul.content-list.issues-list.issuable-list
      = render partial: 'projects/issues/issue', collection: @issues
  = paginate @issues, theme: "gitlab"