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

f0a65ccc · Lukas Eipert · f0d41de3 · f0a65ccc
Commit f0a65ccc authored Apr 19, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/pages/commits.scss app/assets/stylesheets/pages/commits.scss +0 -3

No files found.
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -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 {