diff options
| author | Thibault Francois <tfr@openerp.com> | 2010-12-16 12:01:47 +0100 |
|---|---|---|
| committer | Thibault Francois <tfr@openerp.com> | 2010-12-16 12:01:47 +0100 |
| commit | a5363f5d1b3aa7a1c75ff26ce53326d31aadf5d4 (patch) | |
| tree | dd3ac5ffd418a54e318217b0d95d4cf3914ce948 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 6ab787de08a9e192d557521f0e5d66d9a849a6fe (diff) | |
[MERGE] solve conflict
bzr revid: tfr@openerp.com-20101216110147-p0db1k0d9ltwna5z
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
0 files changed, 0 insertions, 0 deletions