fix merge conflict

common/static/coffee/src/discussion/content.coffee

common/static/coffee/src/discussion/discussion.coffee

common/static/coffee/src/discussion/utils.coffee

...offee/src/discussion/views/discussion_content_view.coffee

...e/src/discussion/views/discussion_thread_list_view.coffee

...e/src/discussion/views/discussion_thread_show_view.coffee

...coffee/src/discussion/views/discussion_thread_view.coffee

...ee/src/discussion/views/response_comment_show_view.coffee

...fee/src/discussion/views/thread_response_show_view.coffee

...c/coffee/src/discussion/views/thread_response_view.coffee

distribute-0.6.32.tar.gz

distribute-0.6.34.tar.gz

lms/djangoapps/django_comment_client/base/urls.py

lms/djangoapps/django_comment_client/base/views.py

lms/djangoapps/django_comment_client/forum/views.py

..._comment_client/management/commands/reload_forum_users.py

lms/djangoapps/django_comment_client/permissions.py

...apps/django_comment_client/tests/test_mustache_helpers.py

lms/djangoapps/django_comment_client/utils.py

lms/lib/comment_client/comment.py