Fix conflict in app/views/shared/issuable/_sidebar.html.haml

bbdaf15e · Clement Ho · 59d00287 · bbdaf15e
Commit bbdaf15e authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/shared/issuable/_sidebar.html.haml app/views/shared/issuable/_sidebar.html.haml +0 -4

No files found.
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -34,11 +34,7 @@
            = link_to _('Edit'), '#', class: 'js-sidebar-dropdown-toggle edit-link float-right'
        .value.hide-collapsed
          - if issuable.milestone
-<<<<<<< HEAD
            = link_to issuable.milestone.title, milestone_path(issuable.milestone), class: "bold has-tooltip", title: milestone_tooltip_due_date(issuable.milestone), data: { container: "body", html: 'true', boundary: 'viewport' }
-=======
-            = link_to issuable.milestone.title, milestone_path(issuable.milestone), class: "bold has-tooltip", title: milestone_tooltip_due_date(issuable.milestone), data: { container: "body", html: 'true' }
->>>>>>> gitlab-ce/master
          - else
            %span.no-value
              = _('None')