Unstable commit; syncing computers

2012-05-31 21:12:08 -04:00
parent 97c6a26c2b
commit 98d8f4b55b
9 changed files with 14 additions and 12 deletions
--- a/djangoapps/courseware/modules/html_module.py
+++ b/djangoapps/courseware/modules/html_module.py
@@ -2,7 +2,7 @@ import json

 from mitxmako.shortcuts import render_to_response, render_to_string

-from x_module import XModule
+from x_module import XModule, XModuleDescriptor
 from lxml import etree

 class ModuleDescriptor(XModuleDescriptor):