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

60f72071 · Clement Ho · 094a643d · 60f72071
Commit 60f72071 authored May 25, 2018 by Clement Ho
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

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