Revert "fix merge conflict"

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

lms/static/sass/_discussion.scss

@@ -95,7 +95,6 @@
 
 
 body.discussion {
-  
   .new-post-form-errors {
     display: none;
     background: $error-red;
@@ -1281,8 +1280,8 @@ body.discussion {
   .discussion-article {
     position: relative;
     padding: 40px;
-    min-height: 468px;         
-    
+    min-height: 468px;
+
     a {
       word-wrap: break-word;
     }
@@ -1335,9 +1334,6 @@ body.discussion {
         background-position: 0 0;
       }
     }
-    
-    
-    
   }
 
   .discussion-post {
@@ -2440,6 +2436,7 @@ body.discussion {
   @extend .discussion-module
 }
 
+
 .group-visibility-label {
     font-size: 12px;
     color:#000;
@@ -2494,39 +2491,4 @@ body.discussion {
 .pinned-false
 {
 display:none;
-}
-
-.discussion-flag-abuse {
-      font-size: 12px;
-      float:right;
-      padding-right: 5px;
-      font-style: italic; 
-    }  
-    
-.notflagged .icon
-{
-  display: inline-block; 
-  width: 10px; 
-  height: 14px;
-  padding-right: 3px;
-  background: transparent url('../images/notflagged.png') no-repeat 0 0; 
-}
-
-.flagged .icon
-{
-  display: inline-block; 
-  width: 10px; 
-  height: 14px; 
-  padding-right: 3px;
-  background: transparent url('../images/flagged.png') no-repeat 0 0; 
-}
-
-.flagged span {
-  color: #B82066;
-  font-style: italic;
-}
-
-.notflagged span {
-  color: #888;
-  font-style: italic;
 }