Fix conflicts

57e4f68f · Annabel Dunstone Gray · 229b1e2e · 57e4f68f
Commit 57e4f68f authored 7 years ago by Annabel Dunstone Gray
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -350,7 +350,6 @@
  
 .scrolling-tabs-container {
  position: relative;
-  overflow: hidden;
  
  .merge-request-tabs-container & {
    overflow: hidden;
@@ -493,10 +492,6 @@
 .inner-page-scroll-tabs {
  position: relative;
  
-  .nav-links {
-    padding-bottom: 1px;
-  }
-
  .fade-right {
    @include fade(left, $white-light);
    right: 0;