Resolve (UU) app/views/shared/_label_row.html.haml

fe22042f · André Luís · ab2cdca8 · fe22042f
Commit fe22042f authored Aug 07, 2018 by André Luís
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/shared/_label_row.html.haml app/views/shared/_label_row.html.haml +0 -3

No files found.
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
 - subject = local_assigns[:subject]
 - force_priority = local_assigns.fetch(:force_priority, false)
-<<<<<<< HEAD
 - show_label_epics_link = defined?(@group) && @group&.feature_available?(:epics)
-=======
->>>>>>> upstream/master
 - show_label_issues_link = defined?(@project) && show_label_issuables_link?(label, :issues, project: @project)
 - show_label_merge_requests_link = defined?(@project) && show_label_issuables_link?(label, :merge_requests, project: @project)