From 7bdc4c51340e83dbeaad23e2fcb9d80934e91247 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Mon, 5 Aug 2013 13:40:26 -0400
Subject: [PATCH] fix errant conflict resolution

---
 common/djangoapps/student/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 7b24f80917..4d59b5cc66 100644
--- 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)