Skip to content

G
gitlab-ce
Commit a856eeaa authored by LUKE BENNETT's avatar LUKE BENNETT
Browse files
Options

Resolve groups.scss conflicts

parent 47179026
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/pages/groups.scss
View file @ a856eeaa
...@@ -273,7 +273,6 @@ table.pipeline-project-metrics tr td { ...@@ -273,7 +273,6 @@ table.pipeline-project-metrics tr td {
border-radius: $label-border-radius; border-radius: $label-border-radius;
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
} }
<<<<<<< HEAD
.plan-badge { .plan-badge {
margin-right: 15px; margin-right: 15px;
...@@ -309,5 +308,3 @@ table.pipeline-project-metrics tr td { ...@@ -309,5 +308,3 @@ table.pipeline-project-metrics tr td {
svg g { fill: $gl-no-plan; } svg g { fill: $gl-no-plan; }
} }
} }
=======
>>>>>>> upstream/master
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