Commit d83a5665 authored by Filipa Lacerda's avatar Filipa Lacerda

[ci skip] Resolve conflicts for app/assets/stylesheets/pages/groups.scss

parent 19d05695
......@@ -86,7 +86,6 @@
}
}
<<<<<<< HEAD
.panel {
.shared_runners_limit_under_quota {
color: $gl-success;
......@@ -121,7 +120,8 @@
table.pipeline-project-metrics tr td {
padding: $gl-padding;
=======
}
.mattermost-icon svg {
width: 16px;
height: 16px;
......@@ -136,5 +136,4 @@ table.pipeline-project-metrics tr td {
display: block;
color: $gl-text-color-secondary;
margin-top: 10px;
>>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
}
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