Commit 2250df94 authored by Rémy Coutable's avatar Rémy Coutable

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

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 62ded594
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment