From 4fcc59b3182cef48fb87da4be42a35d987e55650 Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Fri, 29 Aug 2014 16:50:40 -0400 Subject: [PATCH] Merge branch 'release' into andya/merge-hotfix-2014-08-29 Conflicts: cms/djangoapps/contentstore/tests/test_import.py common/lib/xmodule/xmodule/modulestore/__init__.py common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py lms/djangoapps/courseware/tests/test_module_render.py --- lms/djangoapps/courseware/tests/test_module_render.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index 3dd5c87a7b..2f8ecab123 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -326,13 +326,8 @@ class TestTOC(ModuleStoreTestCase): self.request = factory.get(chapter_url) self.request.user = UserFactory() self.modulestore = self.store._get_modulestore_for_courseid(self.course_key) -<<<<<<< HEAD - self.toy_course = self.store.get_course(self.toy_loc, depth=2) - with check_mongo_calls(num_finds, num_sends): -======= with check_mongo_calls(num_finds, num_sends): self.toy_course = self.store.get_course(self.toy_loc, depth=2) ->>>>>>> release self.field_data_cache = FieldDataCache.cache_for_descriptor_descendents( self.toy_loc, self.request.user, self.toy_course, depth=2 )