Resolve conflict in header/_default.html.haml

Removed unused css class

Resolve conflict in header/_default.html.haml
Removed unused css class
5dcb9014 · Simon Knox · fe31bf10 · 5dcb9014
Commit 5dcb9014 authored Oct 31, 2018 by Simon Knox
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -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