Avoid "Use me" <atom-overlay> to scroll over conflicts panel

smashwilson · May 17, 2016 · e9e198a · e9e198a
1 parent 82c2dc6
commit e9e198a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/styles/merge-conflicts.less b/styles/merge-conflicts.less
@@ -1,6 +1,9 @@
 @import "variables";
 
 .merge-conflicts {
+  position: relative;
+  z-index: 10;
+
   .conflict-list {
     max-height: 150px;
     overflow: scroll;