From 8e253a6d49d8119a094dea97009719201ea7587f Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 19 Aug 2010 16:20:38 -0700
Subject: [PATCH] Left in a merge marker

---
 app/models/user.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 1a02d6ddc..4dd40754a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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