updated flag icons to be font-awesome based

lms/static/sass/_discussion.scss

@@ -2691,20 +2691,35 @@ display:none;
   }
 }
 
+<<<<<<< HEAD
 .notflagged .icon
 {
   display: block;
+=======
+    }  
+    
+.notflagged .icon {
+  display: block; 
+>>>>>>> updated flag icons to be font-awesome based
   float: left;
   margin: 3px;
   width: 10px;
   height: 14px;
   padding-right: 3px;
+<<<<<<< HEAD
 }
 
 .flagged .icon
 {
   display: block;
   color: $gray-l2;
+=======
+  color: $gray-l2;
+}
+
+.flagged .icon {
+  display: block; 
+>>>>>>> updated flag icons to be font-awesome based
   float: left;
   margin: 3px;
   width: 10px;