Skip to content

G
gitlab-ce
Commit f93f0f3c authored by Mike Greiling's avatar Mike Greiling
Browse files
Options

fix conflicts in app/models/user.rb

parent f8870d71
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/user.rb
View file @ f93f0f3c
...@@ -13,12 +13,9 @@ class User < ActiveRecord::Base ...@@ -13,12 +13,9 @@ class User < ActiveRecord::Base
include IgnorableColumn include IgnorableColumn
include FeatureGate include FeatureGate
include CreatedAtFilterable include CreatedAtFilterable
<<<<<<< HEAD
prepend EE::GeoAwareAvatar prepend EE::GeoAwareAvatar
prepend EE::User prepend EE::User
=======
>>>>>>> master-ce
DEFAULT_NOTIFICATION_LEVEL = :participating DEFAULT_NOTIFICATION_LEVEL = :participating
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7