From 764d76778948a70fcbb0f375329a8e61e9914ab6 Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Wed, 14 Sep 2016 01:22:33 -0500
Subject: [PATCH] Update _variables.scss

---
 css/_variables.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/css/_variables.scss b/css/_variables.scss
index 218a66f2f..7ccfc269e 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -1,5 +1,4 @@
 /**
-<<<<<<< HEAD
  * Style variables
  */
 $baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;