fixed merge conflict in extends

2012-08-20 18:15:09 -04:00
parent 3ffcb2615f
commit 88d514e28d
1 changed files with 0 additions and 4 deletions
--- 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();