Resolve merge conflict

14687bb9 · Marcel van Remmerden · 24845799 · 14687bb9
Commit 14687bb9 authored May 07, 2019 by Marcel van Remmerden
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

app/views/layouts/header/_default.html.haml app/views/layouts/header/_default.html.haml +4 -3

No files found.
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -17,6 +17,7 @@
            - if logo_text.present?
              %span.logo-text.d-none.d-lg-block.prepend-left-8
                = logo_text
+          - if Gitlab.com?
            = link_to 'https://next.gitlab.com', class: 'label-link js-canary-badge canary-badge bg-transparent', target: :_blank do
              %span.color-label.has-tooltip.badge.badge-pill.green-badge
                = _('Next')