Commit 14687bb9 authored by Marcel van Remmerden's avatar Marcel van Remmerden

Resolve merge conflict

parent 24845799
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
- if logo_text.present? - if logo_text.present?
%span.logo-text.d-none.d-lg-block.prepend-left-8 %span.logo-text.d-none.d-lg-block.prepend-left-8
= logo_text = logo_text
= link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do - if Gitlab.com?
%span.color-label.has-tooltip.badge.badge-pill.green-badge = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do
= _('Next') %span.color-label.has-tooltip.badge.badge-pill.green-badge
= _('Next')
- if current_user - if current_user
= render "layouts/nav/dashboard" = render "layouts/nav/dashboard"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment