Resolve app/models/user.rb

b06e215c · Lin Jen-Shin · 5a04889b · b06e215c
Commit b06e215c authored Dec 27, 2017 by Lin Jen-Shin
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
@@ -19,11 +19,8 @@ class User < ActiveRecord::Base
  include IgnorableColumn
  include BulkMemberAccessLoad
  include BlocksJsonSerialization
-<<<<<<< HEAD

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

  DEFAULT_NOTIFICATION_LEVEL = :participating