local fix to merge conflict

2013-03-20 09:16:26 -04:00
parent 1e56b7d28d
commit 9964e4c2bb
1 changed files with 0 additions and 4 deletions
--- 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