Resolve conflict in app/assets/stylesheets/framework/variables.scss

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/assets/stylesheets/framework/variables.scss
Signed-off-by: Rémy Coutable <remy@rymai.me>
2250df94 · Rémy Coutable · 62ded594 · 2250df94
Commit 2250df94 authored Jul 18, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

app/assets/stylesheets/framework/variables.scss app/assets/stylesheets/framework/variables.scss +2 -3

No files found.
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -302,13 +302,12 @@ $system-footer-height: $system-header-height;
 $flash-height: 52px;
 $context-header-height: 60px;
 $breadcrumb-min-height: 48px;
-<<<<<<< HEAD

+// EE-only CSS variables START
 $issue-box-upcoming-bg: #8f8f8f;
 $pages-group-name-color: #4c4e54;
 $ldap-members-override-bg: $orange-50;
-=======
->>>>>>> upstream/master
+// EE-only CSS variables END

 /*
 * Common component specific colors