add escaping

lms/templates/courseware/progress.html

@@ -8,7 +8,11 @@
 
 <%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
 
+<<<<<<< HEAD
 <%block name="title"><title>${_("{course_number} Progress").format(course_number=course.display_number_with_default)}</title></%block>
+=======
+<%block name="title"><title>${course.display_number_with_default | h} Progress</title></%block>
+>>>>>>> add escaping
 
 <%!
     from django.core.urlresolvers import reverse