Resolve app/views/groups/labels/index.html.haml

5083bb09 · Sean McGivern · 3c256fa7 · 5083bb09
Commit 5083bb09 authored Sep 03, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

app/views/groups/labels/index.html.haml app/views/groups/labels/index.html.haml +0 -5

No files found.
--- a/app/views/groups/labels/index.html.haml
+++ b/app/views/groups/labels/index.html.haml
 - page_title 'Labels'
 - can_admin_label = can?(current_user, :admin_label, @group)
-<<<<<<< HEAD
 - issuables = ['issues', 'merge requests'] + (@group&.feature_available?(:epics) ? ['epics'] : [])
-=======
- hide = @available_labels.empty? || (params[:page].present? && params[:page] != '1')
- issuables = ['issues', 'merge requests']
->>>>>>> upstream/master

 - if can_admin_label
  - content_for(:header_content) do