From 6ddff7fcb3360cd6c61d6c8fd73cf13088bf083e Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Wed, 20 Mar 2013 09:04:14 -0400
Subject: [PATCH] stash merge

---
 lms/djangoapps/django_comment_client/forum/views.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index 3eee0948da..2c4c218ba5 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -239,7 +239,10 @@ 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