From a381c0adce6ff6a6db3ca34d24cd13a65f5d1a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 14 Aug 2012 17:20:53 +0200
Subject: [PATCH] [REVIEW] res_users in mail_thread: no Chatter-compatible
 anymore ! Some cleaning will follow. Also reidented some code.

bzr revid: tde@openerp.com-20120814152053-edu3i87uzd8ev0u0
---
 addons/mail/res_users.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 6a18560de31..30337c84fe4 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -35,7 +35,7 @@ class res_users(osv.osv):
         - add a welcome message
     """
     _name = 'res.users'
-    _inherit = ['res.users', 'mail.thread']
+    _inherit = ['res.users']
     _inherits = {'mail.alias': 'alias_id'}
     
     _columns = {
@@ -45,10 +45,10 @@ class res_users(osv.osv):
             ('none', 'Never')
             ], 'Receive Feeds by Email', required=True,
             help="Choose in which case you want to receive an email when you "\
-                  "receive new feeds."),
+                 "receive new feeds."),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
-                                    help="Email address internally associated with this user. Incoming emails will appear "
-                                         "in the user's notifications."),
+            help="Email address internally associated with this user. Incoming "\
+                 "emails will appear in the user's notifications."),
     }
     
     _defaults = {