developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict solved

This commit is contained in:
devin 2012-04-28 01:56:00 +08:00
parent 03f19b80b4
commit a99d685bce
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user/user.rb
View File

@ -17,11 +17,7 @@ class User
has_many :managing_apps,:class_name => "AppManager" has_many :managing_apps,:class_name => "AppManager"
has_one :desktop, :autosave => true, :dependent => :destroy has_one :desktop, :autosave => true, :dependent => :destroy
<<<<<<< HEAD
has_many :other_accounts, :autosave => true, :dependent => :destroy has_many :other_accounts, :autosave => true, :dependent => :destroy
=======
#has_many :otheraccount, :autosave => true, :dependent => :destroy
>>>>>>> small change
belongs_to :role belongs_to :role
has_and_belongs_to_many :sub_roles has_and_belongs_to_many :sub_roles
accepts_nested_attributes_for :attribute_values, :allow_destroy => true accepts_nested_attributes_for :attribute_values, :allow_destroy => true