Resolve header.scss conflicts

2f4cdca6 · Luke "Jared" Bennett · 06867f30 · 2f4cdca6
Commit 2f4cdca6 authored May 19, 2017 by Luke "Jared" Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -30,13 +30,10 @@ header {
    background-color: $gray-light;
    border: none;
    border-bottom: 1px solid $border-color;
-<<<<<<< HEAD
-=======
    position: fixed;
    top: 0;
    left: 0;
    right: 0;
->>>>>>> 3c45906... Merge branch 'fix-header-z-index' into 'master'

    @media (max-width: $screen-xs-min) {
      padding: 0 16px;