fix more rebase conflicts

lms/templates/discussion/single_thread.html

@@ -7,11 +7,7 @@
 <%inherit file="../main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">discussion</%block>
-<<<<<<< HEAD
 <%block name="title"><title>${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</title></%block>
-=======
-<%block name="title"><title>Discussion – ${course.display_number_with_default | h}</title></%block>
->>>>>>> add escaping
 
 <%block name="headextra">
 <%static:css group='course'/>

lms/templates/instructor/staff_grading.html

@@ -7,11 +7,7 @@
   <%static:css group='course'/>
 </%block>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Staff Grading</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" />
 

lms/templates/open_ended_problems/open_ended_flagged_problems.html

@@ -7,11 +7,7 @@
 <%static:css group='course'/>
 </%block>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Flagged Open Ended Problems").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Flagged Open Ended Problems</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Flagged Open Ended Problems").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='open_ended_flagged_problems'" />