diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-05-20 09:48:10 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-05-20 09:48:10 +0530 |
| commit | 1ab525acdafec51ee9d68076a0cda5d8f223c4b0 (patch) | |
| tree | d22ed017208acfddae7dc3833a1d981fcaa5df1b /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 38dd957438daddec06d314024009860ff5cfa9ed (diff) | |
[MERGE] Remove conflict
bzr revid: mra@tinyerp.com-20100520041810-ac2ww9oz5jvcj17k
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions