Update _variables.scss

9 years ago · 764d767789
parent 7ded10cd8d
commit 764d767789
1 changed files with 0 additions and 1 deletions
--- a/css/_variables.scss
+++ b/css/_variables.scss
@ -1,5 +1,4 @@
 /**
-<<<<<<< HEAD
 * Style variables
 */
 $baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;