Diana Huang 2df3fe9344 Revert "fix merge conflict" ...

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

2013-04-26 12:40:35 -04:00

..

__init__.py

moved django_comment_client into edx

2012-07-23 16:20:45 -04:00

urls.py

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

views.py

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00