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

9e575663 · Phil Hughes · c2676107 · 9e575663
Commit 9e575663 authored Dec 15, 2017 by Phil Hughes
Show 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
@@ -741,7 +741,6 @@ Image Commenting cursor
 */
 $image-comment-cursor-left-offset: 12;
 $image-comment-cursor-top-offset: 12;
-<<<<<<< HEAD

 /*
 Add GitLab Slack Application
@@ -753,8 +752,6 @@ $add-to-slack-logo-size: 100px;
 $double-headed-arrow-width: 100px;
 $double-headed-arrow-height: 25px;
 $right-arrow-size: 16px;
-=======
->>>>>>> upstream/master

 /*
 Popup