more merging

common/lib/xmodule/xmodule/css/combinedopenended/display.scss

@@ -110,11 +110,6 @@ section.legend-container {
     background-color: #eee;
     font-size: .9em;
   }
-<<<<<<< HEAD
-  margin-bottom: 5px;
-  display: none !important;
-=======
->>>>>>> release
 }
 
 section.combined-open-ended-status {

lms/templates/peer_grading/peer_grading_problem.html

@@ -44,10 +44,10 @@
                         <h3>${_("Written Feedback")}</h3>
                         <p>${_("Please include some written feedback as well.")}</p>
                         <textarea name="feedback" placeholder="Feedback for student" class="feedback-area" cols="70" ></textarea>
-                        <div class="flag-student-container"> ${_("This submission has explicit or pornographic content : ")}
+                        <div class="flag-student-container"> ${_("This submission has explicit or offensive content : ")}
                             <input type="checkbox" class="flag-checkbox" value="student_is_flagged"> 
                         </div>
-                        <div class="answer-unknown-container"> ${_("I do not know how to grade this question : ")}
+                        <div class="answer-unknown-container"> ${_("I am uncomfortable with my choices above : ")}
                             <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown">
                         </div>
                     </div>