From afcfbdac82d36ba919f2de8ff6885b65220ca49a Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 18 May 2017 15:26:16 +0000 Subject: Resolve merge_requests.scss conflict --- app/assets/stylesheets/pages/merge_requests.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 2cefd5e1e83..fb99a23edf9 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -704,11 +704,7 @@ } .merge-request-tabs-holder { -<<<<<<< HEAD -======= - top: $header-height; z-index: 100; ->>>>>>> 3460f36... Merge branch 'fix-merge-request-show-component-z-indices' into 'master' background-color: $white-light; &.affix { -- cgit v1.2.1