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

1bb97947 · Clement Ho · 98b65176 · 1bb97947
Commit 1bb97947 authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/stylesheets/pages/settings.scss app/assets/stylesheets/pages/settings.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -234,11 +234,7 @@
      line-height: 12px;
    }

-<<<<<<< HEAD
-    .card-heading .label-count {
-=======
    .card-header .label-count {
->>>>>>> gitlab-ce/master
      color: $white-light;
      background: $common-gray-dark;
    }