Commit 839b6dca by Calen Pennington

Fix bad merge

parent 8f4b6faa
......@@ -15,7 +15,7 @@ from django_future.csrf import ensure_csrf_cookie
from lxml import etree
from courseware import course_settings
from module_render import render_module, modx_dispatch, make_track_function
from module_render import render_module, make_track_function
from certificates.models import GeneratedCertificate, certificate_state_for_student
from models import StudentModule
from student.models import UserProfile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment