add escaping

lms/templates/courseware/courseware.html

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