Resolve conflicts

634d52be · Kushal Pandya · 1033b430 · 634d52be
Commit 634d52be authored Mar 07, 2018 by Kushal Pandya
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/views/groups/labels/index.html.haml
+++ b/app/views/groups/labels/index.html.haml
 - page_title 'Labels'

-<<<<<<< HEAD
 - issuables = ['issues', 'merge requests'] + (@group&.feature_available?(:epics) ? ['epics'] : [])
-=======
- issuables = ['issues', 'merge requests']
->>>>>>> upstream/master

 .top-area.adjust
  .nav-text