Commit 9fc1229e authored by Clement Ho's avatar Clement Ho

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

parent c52f9ec1
......@@ -213,11 +213,7 @@
.stage-panel {
min-width: 968px;
<<<<<<< HEAD
.card-heading {
=======
.card-header {
>>>>>>> gitlab-ce/master
padding: 0;
background-color: transparent;
}
......
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