From aa8b0545907d8844d813538d9deb88936a9b45d5 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Thu, 25 Jul 2013 13:38:18 -0400
Subject: [PATCH] fix missed conflict resolution

---
 lms/djangoapps/courseware/module_render.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index a851a6d8f4..4f05d660be 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -407,12 +407,8 @@ def get_module_for_descriptor_internal(user, descriptor, model_data_cache, cours
     module.get_html = replace_static_urls(
         _get_html,
         getattr(descriptor, 'data_dir', None),
-<<<<<<< HEAD
-        course_namespace=module.location._replace(category=None, name=None)
+        course_id=course_id
     )
-=======
-        course_id=course_id)
->>>>>>> WIP
 
     # Allow URLs of the form '/course/' refer to the root of multicourse directory
     #   hierarchy of this course