Resolve incomplete conflict resolution in app/views/shared/milestones/_sidebar.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve incomplete conflict resolution in app/views/shared/milestones/_sidebar.html.haml
Signed-off-by: Rémy Coutable <remy@rymai.me>
401b9f76 · Rémy Coutable · b267b3eb · 401b9f76
Commit 401b9f76 authored Nov 16, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

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

No files found.
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -103,7 +103,6 @@
          %span.bold= milestone.human_total_issue_time_spent
        - else
          %span.no-value= _("No time spent")
->>>>>>> upstream/master

    .block.merge-requests
      .sidebar-collapsed-icon