Resolve conflicts in variables.scss

e873caa5 · Annabel Dunstone Gray · bd69d4f1 · e873caa5
Commit e873caa5 authored Aug 22, 2018 by Annabel Dunstone Gray
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

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

No files found.
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -330,13 +330,7 @@ $line-select-yellow-dark: #f0e2bd;
 $dark-diff-match-bg: rgba(255, 255, 255, 0.3);
 $dark-diff-match-color: rgba(255, 255, 255, 0.1);
 $file-mode-changed: #777;
-$file-mode-changed: #777;
-<<<<<<< HEAD
-$diff-image-bg: #ddd;
-$diff-image-info-color: grey;
-=======
 $diff-image-info-color: gray;
->>>>>>> upstream/master
 $diff-swipe-border: #999;
 $diff-view-modes-color: gray;
 $diff-view-modes-border: #c1c1c1;