FIX merge bug

app/models/user.rb

@@ -5,7 +5,7 @@ class User < ApplicationRecord
   include Likeable
   include BaseModel
   include ProjectOperable
-  include Droneable
+  include ProjectAbility
   # include Searchable::Dependents::User
 
   # devops step
@@ -78,9 +78,14 @@ class User < ApplicationRecord
   # 关注
   has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
   has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
+<<<<<<< HEAD
   has_many :watchers, as: :watchable, dependent: :destroy
 
   has_one :dev_ops_cloud_account, class_name: 'DevOps::CloudAccount', dependent: :destroy
+=======
+
+  has_many :watchers, as: :watchable, dependent: :destroy
+>>>>>>> dev_change_route
 
   # 认证
   has_many :apply_user_authentication