stash merge

2013-03-20 09:04:14 -04:00
parent 8cbf24fd73
commit 6ddff7fcb3
1 changed files with 3 additions and 0 deletions
--- 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