fixing merge error

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

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