merge conflicts resolved

lms/static/sass/_discussion.scss

@@ -1399,7 +1399,7 @@ body.discussion {
       }
 
       .row-item-full {
-
+        
         .row-setting {
           display: table-cell;
           vertical-align: middle;

lms/static/sass/application.scss.mako

@@ -70,4 +70,4 @@
 @import 'discussion';
 @import 'news';
 
-@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/)
+@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/)
\ No newline at end of file