Resolve conflicts in app/assets/stylesheets/pages/environments.scss

ad71238b · Stan Hu · b4c14fd2 · ad71238b
Commit ad71238b authored Apr 07, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -578,7 +578,6 @@
 .prometheus-table-row-highlight {
  background-color: $prometheus-table-row-highlight-color;
 }
-<<<<<<< HEAD

 // EE-only
 .cluster-health-graphs {
@@ -593,5 +592,3 @@
    }
  }
 }
-=======
->>>>>>> upstream/master