odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail: res.users: forgot to resolve a conflict. 

bzr revid: tde@openerp.com-20120511124927-ox8egxt216w9j4i7
This commit is contained in:
Thibault Delavallée 2012-05-11 14:49:27 +02:00
parent 7a553f429b
commit c4b38f4858
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/mail/res_users.py
View File

@ -33,16 +33,12 @@ class res_users(osv.osv):
_columns = {
'notification_email_pref': fields.selection([
('all', 'All feeds'),
('to_me', 'Only sent directly to me'),
('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'),
('none', 'Never')
<<<<<<< TREE
], 'Receive feeds by email', required=True,
help="Choose in which case you want to receive \
an email when you receive new feeds."),
=======
], 'Receive Feeds by E-mail', required=True,
help="Choose in which case you want to receive an email when you receive new feeds."),
>>>>>>> MERGE-SOURCE
help="Choose in which case you want to receive an \
email when you receive new feeds."),
}
_defaults = {