From 07ebc8336804cce38d35292fa1f80c1050ab495b Mon Sep 17 00:00:00 2001 From: Brittany Cheng Date: Wed, 1 Aug 2012 14:39:26 -0400 Subject: [PATCH] fixing merge error --- lms/djangoapps/courseware/views.py | 4 +--- lms/lib/dogfood/views.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index ecb7e7fd6f..51e15e9127 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -23,11 +23,9 @@ from django.views.decorators.cache import cache_control from module_render import toc_for_course, get_module, get_section from models import StudentModuleCache from student.models import UserProfile -<<<<<<< HEAD from multicourse import multicourse_settings -======= ->>>>>>> 38dd8f18984df3ab14f5715891af7f984c7f14a7 + from django_comment_client.utils import get_discussion_title from xmodule.modulestore import Location diff --git a/lms/lib/dogfood/views.py b/lms/lib/dogfood/views.py index 7a0e03436d..6df881df98 100644 --- a/lms/lib/dogfood/views.py +++ b/lms/lib/dogfood/views.py @@ -24,7 +24,6 @@ from mitxmako.shortcuts import render_to_response, render_to_string import track.views from lxml import etree - from courseware.module_render import make_track_function, ModuleSystem, get_module from courseware.models import StudentModule from multicourse import multicourse_settings