diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-05-11 14:49:27 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-05-11 14:49:27 +0200 |
| commit | c4b38f48582e2679ad1cc011508c8eab9705aa5c (patch) | |
| tree | 07bdde40bdea65c4eb15aa244b501e12d687ee2b /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 7a553f429b713b9bab878f314f1701734fed4753 (diff) | |
[FIX] mail: res.users: forgot to resolve a conflict.
bzr revid: tde@openerp.com-20120511124927-ox8egxt216w9j4i7
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions