From a99d685bce6c35b7b4c2b19f40c77f61b8e11bb9 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Sat, 28 Apr 2012 01:56:00 +0800
Subject: [PATCH] conflict solved

---
 app/models/user/user.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 9b5c9544..2b405e16 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -17,11 +17,7 @@ class User
   
   has_many :managing_apps,:class_name => "AppManager"
   has_one :desktop, :autosave => true, :dependent => :destroy
-<<<<<<< HEAD
   has_many :other_accounts, :autosave => true, :dependent => :destroy
-=======
-  #has_many :otheraccount, :autosave => true, :dependent => :destroy
->>>>>>> small change
   belongs_to :role
   has_and_belongs_to_many :sub_roles
   accepts_nested_attributes_for :attribute_values, :allow_destroy => true