Resolve CSS conflict

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve CSS conflict
Signed-off-by: Rémy Coutable <remy@rymai.me>
d60364f7 · Rémy Coutable · 206d451e · d60364f7
Commit d60364f7 authored May 18, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/stylesheets/pages/merge_requests.scss app/assets/stylesheets/pages/merge_requests.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -722,10 +722,6 @@

  &.affix {
    left: 0;
-<<<<<<< HEAD
-    z-index: 100;
-=======
->>>>>>> upstream/master
    transition: right .15s;

    @media (max-width: $screen-xs-max) {