Skip to content

G
gitlab-ce
Commit f0a65ccc authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

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

parent f0d41de3
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/pages/commits.scss
View file @ f0a65ccc
...@@ -180,13 +180,10 @@ ...@@ -180,13 +180,10 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-grow: 1; flex-grow: 1;
<<<<<<< HEAD
.project_namespace { .project_namespace {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
=======
>>>>>>> upstream/master
} }
.commit-content { .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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7