Fix issuable conflict

app/models/concerns/issuable.rb

@@ -111,13 +111,10 @@ module Issuable
     def allows_multiple_assignees?
       false
     end
-<<<<<<< HEAD
-=======
 
     def has_multiple_assignees?
       assignees.count > 1
     end
->>>>>>> upstream/master
   end
 
   class_methods do