Fixed issuable.scss conflict

[ci skip]

Fixed issuable.scss conflict
[ci skip]
c31b4573 · Phil Hughes · 64d0285b · c31b4573
Commit c31b4573 authored May 17, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/stylesheets/pages/issuable.scss app/assets/stylesheets/pages/issuable.scss +0 -6

No files found.
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -195,13 +195,8 @@
  right: 0;
  transition: width .3s;
  background: $gray-light;
-<<<<<<< HEAD
-  padding: 10px 20px;
-  z-index: 200;
-=======
  padding: 0 20px;
  z-index: 200;
-  overflow: hidden;
  .issuable-sidebar {
    width: calc(100% + 100px);
@@ -210,7 +205,6 @@
    overflow-x: hidden;
    -webkit-overflow-scrolling: touch;
  }
->>>>>>> upstream/master
  &.right-sidebar-expanded {
    width: $gutter_width;