[skip ci] fix merge conflicts

ffcbf5d4 · Clement Ho · f227ce6a · ffcbf5d4
Commit ffcbf5d4 authored Mar 29, 2017 by Clement Ho
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/models/concerns/issuable.rb app/models/concerns/issuable.rb +0 -6

No files found.
--- a/app/models/concerns/issuable.rb
+++ b/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