Skip to content

G
gitlab-ce
Commit aba31563 authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files
Options

Fix conflict in dropdowns.scss

parent 435432fd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/framework/dropdowns.scss
View file @ aba31563
...@@ -849,8 +849,6 @@ ...@@ -849,8 +849,6 @@
} }
} }
<<<<<<< HEAD
=======
@media (max-width: $screen-xs-max) { @media (max-width: $screen-xs-max) {
.navbar-gitlab { .navbar-gitlab {
li.header-projects, li.header-projects,
...@@ -870,7 +868,6 @@ ...@@ -870,7 +868,6 @@
} }
} }
>>>>>>> upstream/master
@include new-style-dropdown('.breadcrumbs-list .dropdown '); @include new-style-dropdown('.breadcrumbs-list .dropdown ');
@include new-style-dropdown('.js-namespace-select + '); @include new-style-dropdown('.js-namespace-select + ');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7