[CE->EE] resolve app/views/shared/issuable/_nav.html.haml [ci skip]

9f065c97 · Valery Sizov · 498887cc · 9f065c97
Commit 9f065c97 authored Dec 05, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/shared/issuable/_nav.html.haml app/views/shared/issuable/_nav.html.haml +0 -4

No files found.
--- a/app/views/shared/issuable/_nav.html.haml
+++ b/app/views/shared/issuable/_nav.html.haml
 - type = local_assigns.fetch(:type, :issues)
 - page_context_word = type.to_s.humanize(capitalize: false)
-<<<<<<< HEAD
- issuables = @issues || @merge_requests || @epics
-=======
->>>>>>> upstream/master

 %ul.nav-links.issues-state-filters
  - if type != :epics