Skip to content

E
edx-platform
Commit 6ddff7fc by Your Name
Options

stash merge

parent 8cbf24fd
Showing with 3 additions and 0 deletions
lms/djangoapps/django_comment_client/forum/views.py
...@@ -239,7 +239,10 @@ def forum_form_discussion(request, course_id): ...@@ -239,7 +239,10 @@ def forum_form_discussion(request, course_id):
'is_course_cohorted': is_course_cohorted(course_id) 'is_course_cohorted': is_course_cohorted(course_id)
} }
# print "start rendering.." # print "start rendering.."
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
return render_to_response('discussion/index.html', context) return render_to_response('discussion/index.html', context)
@login_required @login_required
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment