nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Left in a merge marker

Browse source
This commit is contained in:
Raphael 2010-08-19 16:20:38 -07:00
parent 125f70abff
commit 8e253a6d49
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/user.rb
View file

@ -357,16 +357,11 @@ class User
id = ensure_bson person.id
groups.select {|group| group.person_ids.include? id}
end
<<<<<<< HEAD
protected
def setup_person
self.person.serialized_key ||= generate_key.export
=======
def setup_person
self.person.serialized_key = generate_key.export
>>>>>>> 2e76987e259ff23455d00c077fd347b4376d7e0e
self.person.email = email
self.person.save!
end