Skip to content

G
gitlab-ce
Commit 9d720c47 authored by winh's avatar winh
Browse files
Options

Resolve conflict in selects.scss

parent 50fae638
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
app/assets/stylesheets/framework/selects.scss
View file @ 9d720c47
...@@ -279,11 +279,8 @@ ...@@ -279,11 +279,8 @@
// TODO: change global style // TODO: change global style
.ajax-project-dropdown, .ajax-project-dropdown,
<<<<<<< HEAD
body[data-page="projects:settings:repository:show"] #select2-drop,
=======
body[data-page="projects:edit"] #select2-drop, body[data-page="projects:edit"] #select2-drop,
>>>>>>> ce-com/master body[data-page="projects:settings:repository:show"] #select2-drop,
body[data-page="projects:new"] #select2-drop, body[data-page="projects:new"] #select2-drop,
body[data-page="projects:merge_requests:edit"] #select2-drop, body[data-page="projects:merge_requests:edit"] #select2-drop,
body[data-page="projects:blob:new"] #select2-drop, body[data-page="projects:blob:new"] #select2-drop,
......
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