Skip to content

G
gitlab-ce
Commit 98b65176 authored by Clement Ho's avatar Clement Ho
Browse files
Options

Fix conflict in app/assets/stylesheets/pages/milestone.scss

parent 54f2ca24
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/stylesheets/pages/milestone.scss
View file @ 98b65176
...@@ -31,11 +31,7 @@ ...@@ -31,11 +31,7 @@
} }
} }
<<<<<<< HEAD
.card-heading {
=======
.card-header { .card-header {
>>>>>>> gitlab-ce/master
line-height: $line-height-base; line-height: $line-height-base;
padding: 14px 16px; padding: 14px 16px;
display: -webkit-flex; display: -webkit-flex;
......
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