Merged more conflicts

app/models/user.rb

@@ -1,6 +1,4 @@
 class User < ActiveRecord::Base
-<<<<<<< HEAD
-=======
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
@@ -9,7 +7,6 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
   require 'open-uri'
 
   attr_accessible :card_id, :card_number, :card_permissions, :name