From 03f19b80b4141043bdbb0e4e24d1d9958c0b1e95 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Sat, 28 Apr 2012 01:49:02 +0800
Subject: [PATCH] small change

---
 app/assets/stylesheets/desktopmain.css | 4 ++--
 app/models/user/user.rb                | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index 4aead425..b86c88af 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -358,7 +358,7 @@ a:focus { outline: none; }
 	}
 .group{
 	float: left;
-	margin-right: 36px;
+	margin-right: 24px;
 	max-width: 800px;
 	/*max-height:540px;*/
 }
@@ -472,5 +472,5 @@ a:focus { outline: none; }
 	
 }
 .grp{
-	min-height:540px;
+	min-height:528px;
 }
\ No newline at end of file
diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 2b405e16..9b5c9544 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -17,7 +17,11 @@ 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