fix mega merge conflicts

lms/lib/comment_client/comment.py

@@ -1,9 +1,10 @@
-from utils import *
+from .utils import *
 
-from thread import Thread
+from .thread import Thread
 import models
 import settings
 
+
 class Comment(models.Model):
 
     accessible_fields = [
@@ -63,9 +64,11 @@ class Comment(models.Model):
         request = perform_request('put', url, params)
         voteable.update_attributes(request)             
 
+
 def _url_for_thread_comments(thread_id):
     return "{prefix}/threads/{thread_id}/comments".format(prefix=settings.PREFIX, thread_id=thread_id)
 
+
 def _url_for_comment(comment_id):
     return "{prefix}/comments/{comment_id}".format(prefix=settings.PREFIX, comment_id=comment_id)