fix conflicts in app/models/user.rb

f93f0f3c · Mike Greiling · f8870d71 · f93f0f3c
Commit f93f0f3c authored Jul 08, 2017 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/user.rb app/models/user.rb +0 -3

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -13,12 +13,9 @@ class User < ActiveRecord::Base
  include IgnorableColumn
  include FeatureGate
  include CreatedAtFilterable
-<<<<<<< HEAD

  prepend EE::GeoAwareAvatar
  prepend EE::User
-=======
->>>>>>> master-ce

  DEFAULT_NOTIFICATION_LEVEL = :participating