more post-open source reconciliation

models/comment_thread.rb

@@ -238,15 +238,6 @@ class CommentThread < Content
 
   def to_hash(params={})
     doc = as_document.slice(*%w[title body course_id anonymous anonymous_to_peers commentable_id created_at updated_at at_position_list closed])
-<<<<<<< HEAD
-    .merge("id" => _id, "user_id" => author.id,
-    "username" => author.username,
-    "votes" => votes.slice(*%w[count up_count down_count point]),
-    "tags" => tags_array,
-    "type" => "thread",
-    "group_id" => group_id,
-    "endorsed" => endorsed?)
-=======
                      .merge("id" => _id, "user_id" => author_id,
                             "username" => author.username,
                             "votes" => votes.slice(*%w[count up_count down_count point]),
@@ -256,8 +247,6 @@ class CommentThread < Content
                             "group_id" => group_id,
                             "pinned" => pinned?,
                             "endorsed" => endorsed?)
->>>>>>> master
-
     if params[:recursive]
       doc = doc.merge("children" => root_comments.map{|c| c.to_hash(recursive: true)})
     end
@@ -304,17 +293,12 @@ class CommentThread < Content
     !!(tag =~ RE_TAG)
   end
 
-<<<<<<< HEAD
   private
-=======
   def comment_thread_id
     #so that we can use the comment thread id as a common attribute for flagging
     self.id
   end  
   
-private
->>>>>>> master
-
   RE_HEADCHAR = /[a-z0-9]/
   RE_ENDONLYCHAR = /\+/
   RE_ENDCHAR = /[a-z0-9\#]/