diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-18 15:26:16 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-18 15:26:16 +0000 |
| commit | afcfbdac82d36ba919f2de8ff6885b65220ca49a (patch) | |
| tree | ea97b16f8d074869fe94ba1c871cb92df61582cd | |
| parent | 62ad2f429da8018472ab7fb6d269862a6118c6b2 (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11344.tar.gz | |
Resolve merge_requests.scss conflict9-2-stable-fix-conflicts-for-mr-11344
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
1 files changed, 0 insertions, 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 { |