Skip to content

E
edx-platform
Commit aa8b0545 by Chris Dodge
Options

fix missed conflict resolution

parent 9f14f1ee
Showing with 1 additions and 5 deletions
lms/djangoapps/courseware/module_render.py
...@@ -407,12 +407,8 @@ def get_module_for_descriptor_internal(user, descriptor, model_data_cache, cours ...@@ -407,12 +407,8 @@ def get_module_for_descriptor_internal(user, descriptor, model_data_cache, cours
module.get_html = replace_static_urls( module.get_html = replace_static_urls(
_get_html, _get_html,
getattr(descriptor, 'data_dir', None), getattr(descriptor, 'data_dir', None),
<<<<<<< HEAD course_id=course_id
course_namespace=module.location._replace(category=None, name=None)
) )
=======
course_id=course_id)
>>>>>>> WIP
# Allow URLs of the form '/course/' refer to the root of multicourse directory # Allow URLs of the form '/course/' refer to the root of multicourse directory
# hierarchy of this course # hierarchy of this course
......
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