Commit f0a65ccc authored by Lukas Eipert's avatar Lukas Eipert

Resolve conflicts in `app/assets/stylesheets/pages/commits.scss`

parent f0d41de3
......@@ -180,13 +180,10 @@
justify-content: space-between;
align-items: center;
flex-grow: 1;
<<<<<<< HEAD
.project_namespace {
color: $gl-text-color-secondary;
}
=======
>>>>>>> upstream/master
}
.commit-content {
......
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