Resolve conflict in app/models/user.rb

3511ee7e · Douwe Maan · ad15eefd · 3511ee7e
Commit 3511ee7e authored Dec 12, 2017 by Douwe Maan
Hide 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
@@ -18,12 +18,9 @@ class User < ActiveRecord::Base
  include CreatedAtFilterable
  include IgnorableColumn
  include BulkMemberAccessLoad
-<<<<<<< HEAD

  prepend EE::GeoAwareAvatar
  prepend EE::User
-=======
->>>>>>> upstream/master

  DEFAULT_NOTIFICATION_LEVEL = :participating