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

9fc1229e · Clement Ho · c52f9ec1 · 9fc1229e
Commit 9fc1229e 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/cycle_analytics.scss app/assets/stylesheets/pages/cycle_analytics.scss +0 -4

No files found.
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -213,11 +213,7 @@
  .stage-panel {
    min-width: 968px;
-<<<<<<< HEAD
-    .card-heading {
-=======
    .card-header {
->>>>>>> gitlab-ce/master
      padding: 0;
      background-color: transparent;
    }