Skip to content

G
gitlab-ce
Commit 9e575663 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

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

parent c2676107
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/framework/variables.scss
View file @ 9e575663
...@@ -741,7 +741,6 @@ Image Commenting cursor ...@@ -741,7 +741,6 @@ Image Commenting cursor
*/ */
$image-comment-cursor-left-offset: 12; $image-comment-cursor-left-offset: 12;
$image-comment-cursor-top-offset: 12; $image-comment-cursor-top-offset: 12;
<<<<<<< HEAD
/* /*
Add GitLab Slack Application Add GitLab Slack Application
...@@ -753,8 +752,6 @@ $add-to-slack-logo-size: 100px; ...@@ -753,8 +752,6 @@ $add-to-slack-logo-size: 100px;
$double-headed-arrow-width: 100px; $double-headed-arrow-width: 100px;
$double-headed-arrow-height: 25px; $double-headed-arrow-height: 25px;
$right-arrow-size: 16px; $right-arrow-size: 16px;
=======
>>>>>>> upstream/master
/* /*
Popup Popup
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7