additional git rebase cleanup

lms/static/sass/_discussion.scss

@@ -845,6 +845,9 @@ body.discussion {
       .drop-arrow {
         font-size: 16px;
       }
+      .drop-arrow {
+        font-size: 16px;
+      }
     }
 
     .browse-topic-drop-icon {
@@ -1428,7 +1431,6 @@ body.discussion {
     .icon-envelope {color: $gray;}
   }
 
-
   .discussion-article {
     position: relative;
     padding: $baseline*2;

lms/static/sass/application.scss.mako

@@ -40,6 +40,7 @@
 
 // base - starter
 @import 'base/base';
+
 // shared - course 
 @import 'shared/forms';
 @import 'shared/footer';