fix errant conflict resolution

2013-08-05 13:40:26 -04:00
parent 52928d165a
commit 7bdc4c5134
1 changed files with 0 additions and 2 deletions
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -96,8 +96,6 @@ def index(request, extra_context={}, user=None):

    context = {'courses': courses}

-    context = {'courses': courses, 'news': top_news}
-
    context.update(extra_context)
    return render_to_response('index.html', context)