remove duplicate scss rule

9cfceb5f · Simon Knox · cec602a1 · 9cfceb5f
Commit 9cfceb5f authored Jun 12, 2018 by Simon Knox
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/assets/stylesheets/framework/header.scss app/assets/stylesheets/framework/header.scss +0 -7

No files found.
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -457,13 +457,6 @@
  @include media-breakpoint-down(xs) {
    margin-top: $gl-padding-4;
  }
-<<<<<<< HEAD
-}
-
-.with-performance-bar header.navbar-gitlab {
-  top: $performance-bar-height;
-=======
->>>>>>> upstream/master
 }

 .navbar-nav {