diff options
| author | Kuldeep Joshi (OpenERP) <kjo@tinyerp.com> | 2012-07-05 14:38:30 +0530 |
|---|---|---|
| committer | Kuldeep Joshi (OpenERP) <kjo@tinyerp.com> | 2012-07-05 14:38:30 +0530 |
| commit | c5d9158a292c6439d4192cbd2601b15ae9ee51b5 (patch) | |
| tree | 9f56a2c9207e6cbf7629d10513baf298c62f5422 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 52c359e063fff81daa1781c9b40e8498f94a0508 (diff) | |
[IMP]event: remove conflict
bzr revid: kjo@tinyerp.com-20120705090830-trou4tqk01ylqqqh
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
0 files changed, 0 insertions, 0 deletions