From 18a497e150712ff7fa54c902a3cc9552a71d4b2c Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Wed, 4 Sep 2013 11:22:52 -0400
Subject: [PATCH] Fix merge conflict in sass

---
 lms/static/sass/base/_variables.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss
index 472b4a8ce1..34dd58dd6b 100644
--- a/lms/static/sass/base/_variables.scss
+++ b/lms/static/sass/base/_variables.scss
@@ -64,9 +64,6 @@ $green: rgb(37, 184, 90);
 $light-gray: #ddd;
 $dark-gray: #333;
 
-<<<<<<< HEAD
-// COLORS: edx.org marketing site variables
-=======
 // used by descriptor css
 $lightGrey: #edf1f5;
 $darkGrey: #8891a1;
@@ -77,7 +74,6 @@ $shadow: rgba($black, 0.2);
 $shadow-l1: rgba($black, 0.1);
 
 // edx.org marketing site variables
->>>>>>> master
 $m-gray: #8A8C8F;
 $m-gray-l1: #97999B;
 $m-gray-l2: #A4A6A8;