fix errant conflict resolution

7bdc4c51 · Chris Dodge · 52928d16 · 7bdc4c51
Commit 7bdc4c51 authored Aug 05, 2013 by Chris Dodge
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

common/djangoapps/student/views.py
+0 -2

No files found.
--- 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)