Browse Source

Update _variables.scss

j8
yanas 9 years ago
parent
commit
764d767789
1 changed files with 0 additions and 1 deletions
  1. 0
    1
      css/_variables.scss

+ 0
- 1
css/_variables.scss View File

@@ -1,5 +1,4 @@
1 1
 /**
2
-<<<<<<< HEAD
3 2
  * Style variables
4 3
  */
5 4
 $baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;

Loading…
Cancel
Save