Remove accidentally remaining merge conflict markers

Author: trichoplax

app/models/comment_thread.rb

@@ -44,7 +44,6 @@ def can_access?(user)
     (!deleted? || user&.privilege?('flag_curate') || user&.post_privilege?('flag_curate', post)) &&
       post.can_access?(user)
   end
-<<<<<<< HEAD
 
   # Gets a list of user IDs who should be pingable in the thread.
   # @return [Array<Integer>]
@@ -86,6 +85,4 @@ def create_follower
       ThreadFollower.create comment_thread: self, user: post.user
     end
   end
-=======
->>>>>>> 2dc90352 (Move followed_by? method to post model to simplify calling)
 end