Resolved _sidebar.html.haml conflicts

21e78c85 · Luke "Jared" Bennett · e884a4bf · 21e78c85
Commit 21e78c85 authored May 02, 2017 by Luke "Jared" Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -85,7 +85,6 @@
              Closed:
              = milestone.issues_visible_to_user(current_user).closed.count

-<<<<<<< HEAD
    - total_weight = milestone.issues_visible_to_user(current_user).sum(:weight)
    .block.weight
      .sidebar-collapsed-icon
@@ -103,10 +102,7 @@
        - else
          .no-value None

-    .block
-=======
    .block.merge-requests
->>>>>>> ce-com/master
      .sidebar-collapsed-icon
        %strong
          = icon('exclamation', 'aria-hidden': 'true')