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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/stylesheets/framework/variables.scss

@@ -733,8 +733,6 @@ $java: #70ad51;
 Issuable warning
 */
 $issuable-warning-size: 24px;
-<<<<<<< HEAD
-=======
 $issuable-warning-icon-margin: 4px;
 
 /*
@@ -742,4 +740,3 @@ Image Commenting cursor
 */
 $image-comment-cursor-left-offset: 12;
 $image-comment-cursor-top-offset: 30;
->>>>>>> ce-com/master