From cd0e3c11072459be293e1db71b63c639adafd214 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 7 Jul 2018 14:04:37 -0700
Subject: [PATCH] Resolve conflicts in
app/assets/stylesheets/framework/mixins.scss
---
app/assets/stylesheets/framework/mixins.scss | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 9b010c623b1be..ada4022b66cac 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -233,7 +233,6 @@
max-width: 100%;
}
-<<<<<<< HEAD
/*
* Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs)
*/
@@ -333,8 +332,6 @@
animation: blinking-dots 1s linear infinite;
}
-=======
->>>>>>> upstream/master
@mixin borderless-status-icon($color) {
svg {
border: 1px solid $color;
--
GitLab