Update app/assets/stylesheets/framework/mixins.scss

128f37a2 · Dennis Tang · 11935d8b · 128f37a2
Commit 128f37a2 authored Aug 03, 2018 by Dennis Tang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/stylesheets/framework/mixins.scss app/assets/stylesheets/framework/mixins.scss +0 -3

No files found.
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -237,7 +237,6 @@
  max-width: 100%;
 }

-<<<<<<< HEAD
 /*
 * Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs)
 */
@@ -328,8 +327,6 @@
  }
 }

-=======
->>>>>>> upstream/master
 @mixin build-loader-animation {
  position: relative;
  white-space: initial;