From 9964e4c2bbda679f4d5dee977ed5101972c02751 Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Wed, 20 Mar 2013 09:16:26 -0400
Subject: [PATCH] local fix to merge conflict

---
 lms/djangoapps/django_comment_client/forum/views.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index 2c4c218ba5..c9fdda7a2e 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -239,10 +239,6 @@ def forum_form_discussion(request, course_id):
             'is_course_cohorted': is_course_cohorted(course_id)
         }
         # print "start rendering.."
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
         return render_to_response('discussion/index.html', context)
 
 @login_required