Skip to content

G
gitlab-ce
Commit 5dcb9014 authored by Simon Knox's avatar Simon Knox
Browse files
Options

Resolve conflict in header/_default.html.haml 

Removed unused css class
parent fe31bf10
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/views/layouts/header/_default.html.haml
View file @ 5dcb9014
...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
- else - else
- search_path_url = search_path - search_path_url = search_path
<<<<<<< HEAD
%header.navbar.navbar-gitlab.qa-navbar.navbar-expand-sm.navbar-gitlab-new.js-navbar
=======
%header.navbar.navbar-gitlab.qa-navbar.navbar-expand-sm.js-navbar %header.navbar.navbar-gitlab.qa-navbar.navbar-expand-sm.js-navbar
>>>>>>> upstream/master
%a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
.container-fluid .container-fluid
.header-content .header-content
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7