From 88d514e28d3dd12287b4d2d9587410fd4b1dc342 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Mon, 20 Aug 2012 18:15:09 -0400
Subject: [PATCH] fixed merge conflict in extends

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

diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 9604a6a7e6..f04d879bc3 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -37,11 +37,7 @@ h1.top-header {
 .content {
   @include box-sizing(border-box);
   display: table-cell;
-<<<<<<< HEAD
   padding: 2em 2.5em;
-=======
-  padding-right: lh();
->>>>>>> master
   vertical-align: top;
   width: flex-grid(9) + flex-gutter();