[skip ci] fix merge conflicts

app/models/concerns/issuable.rb

@@ -114,12 +114,6 @@ module Issuable
     def locking_enabled?
       title_changed? || description_changed?
     end
-
-    def assignees
-      [User.first, User.last, User.first, User.last]
-
-      # [User.first, User.last, User.first, User.last, User.first, User.last, User.first, User.last, User.first, User.last, User.first, User.last, User.last]
-    end
   end
 
   module ClassMethods

app/serializers/issuable_entity.rb

@@ -16,4 +16,4 @@ class IssuableEntity < Grape::Entity
   expose :total_time_spent
   expose :human_time_estimate
   expose :human_total_time_spent
-end
+end
\ No newline at end of file

app/views/projects/issues/_issue.html.haml

@@ -48,4 +48,4 @@
             = issue.weight
 
         .pull-right.issue-updated-at
-          %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
+          %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
\ No newline at end of file