Skip to content

G
gitlab-ce
Commit 5a8e8382 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/stylesheets/framework/dropdowns.scss 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent f8e93cbb
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/framework/dropdowns.scss
View file @ 5a8e8382
...@@ -1031,7 +1031,6 @@ header.header-content .dropdown-menu.projects-dropdown-menu { ...@@ -1031,7 +1031,6 @@ header.header-content .dropdown-menu.projects-dropdown-menu {
} }
} }
<<<<<<< HEAD
.new-epic-dropdown { .new-epic-dropdown {
.dropdown-menu { .dropdown-menu {
padding-left: $gl-padding-top; padding-left: $gl-padding-top;
...@@ -1061,8 +1060,6 @@ header.header-content .dropdown-menu.projects-dropdown-menu { ...@@ -1061,8 +1060,6 @@ header.header-content .dropdown-menu.projects-dropdown-menu {
} }
} }
=======
>>>>>>> upstream/master
.dropdown-content-faded-mask { .dropdown-content-faded-mask {
position: relative; position: relative;
......
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