Add pre escapes to failure messages

mitodl · Apr 21, 2015 · 04dfcec · 04dfcec
1 parent 0d35f0c
commit 04dfcec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lmod_proxy/edx_grades/templates/edx_grades/grade_transfer_failed.html b/lmod_proxy/edx_grades/templates/edx_grades/grade_transfer_failed.html
@@ -1,3 +1,4 @@
+</pre>
 <p>
   {{ number_failed }} of grades failed to transfer
 </p>
@@ -8,3 +9,4 @@
   </li>
   {% endfor %}
 </ul>
+<pre>
diff --git a/requirements.txt.orig b/requirements.txt.orig
@@ -0,0 +1,14 @@
+--index-url https://pypi.python.org/simple/
+<<<<<<< HEAD
+flask==0.10.1
+flask-log==0.1.0
+passlib==1.6.2
+pylmod==0.1.0
+PyYAML==3.11
+uwsgi==2.0.10
+
+=======
+
+-e git+https://github.com/mitodl/pylmod.git#egg=pylmod
+>>>>>>> Use proper multipart form type for ``datafile`` field in form
+-e .