conflict solved

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