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

98b65176 · Clement Ho · 54f2ca24 · 98b65176
Commit 98b65176 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/milestone.scss app/assets/stylesheets/pages/milestone.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -31,11 +31,7 @@
    }
  }

-<<<<<<< HEAD
-  .card-heading {
-=======
  .card-header {
->>>>>>> gitlab-ce/master
    line-height: $line-height-base;
    padding: 14px 16px;
    display: -webkit-flex;