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

4f74e882 · Dennis Tang · 35491ba7 · 4f74e882
Commit 4f74e882 authored Sep 06, 2018 by Dennis Tang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -275,15 +275,12 @@ $flash-height: 52px;
 $context-header-height: 60px;
 $breadcrumb-min-height: 48px;
 $project-title-row-height: 24px;
-<<<<<<< HEAD

 // EE-only CSS variables START
 $system-header-height: 35px;
 $issue-box-upcoming-bg: #8f8f8f;
 $pages-group-name-color: #4c4e54;
 // EE-only CSS variables END
-=======
->>>>>>> upstream/master

 /*
 * Common component specific colors