Commit 5dcb9014 authored by Simon Knox's avatar Simon Knox

Resolve conflict in header/_default.html.haml

Removed unused css class
parent fe31bf10
......@@ -5,11 +5,7 @@
- else
- 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
>>>>>>> upstream/master
%a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
.container-fluid
.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