fixes badly done merge

2015-08-28 13:41:51 +02:00
parent cb99996317
commit 3720551e78
1 changed files with 0 additions and 4 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,9 +1,5 @@
 class User < ActiveRecord::Base
-<<<<<<< HEAD
-  include ActsAsParanoidAliases
  include Verification
-=======
->>>>>>> master

  OMNIAUTH_EMAIL_PREFIX = 'omniauth@participacion'
  OMNIAUTH_EMAIL_REGEX  = /\A#{OMNIAUTH_EMAIL_PREFIX}/