Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge error

Browse Source
This commit is contained in:
Brittany Cheng
2012-08-01 14:39:26 -04:00
parent bdab90190f
commit 07ebc83368
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/courseware/views.py
View File

@@ -23,11 +23,9 @@ from django.views.decorators.cache import cache_control
from module_render import toc_for_course, get_module, get_section from module_render import toc_for_course, get_module, get_section
from models import StudentModuleCache from models import StudentModuleCache
from student.models import UserProfile from student.models import UserProfile
<<<<<<< HEAD
from multicourse import multicourse_settings from multicourse import multicourse_settings
=======
>>>>>>> 38dd8f18984df3ab14f5715891af7f984c7f14a7
from django_comment_client.utils import get_discussion_title from django_comment_client.utils import get_discussion_title
from xmodule.modulestore import Location from xmodule.modulestore import Location

1
lms/lib/dogfood/views.py
View File

@@ -24,7 +24,6 @@ from mitxmako.shortcuts import render_to_response, render_to_string
import track.views import track.views
from lxml import etree from lxml import etree
from courseware.module_render import make_track_function, ModuleSystem, get_module from courseware.module_render import make_track_function, ModuleSystem, get_module
from courseware.models import StudentModule from courseware.models import StudentModule
from multicourse import multicourse_settings from multicourse import multicourse_settings