diff options
| author | ARA (OpenERP) <ara@tinyerp.com> | 2010-11-24 11:19:13 +0530 |
|---|---|---|
| committer | ARA (OpenERP) <ara@tinyerp.com> | 2010-11-24 11:19:13 +0530 |
| commit | 08584d04f5b28b9f60ad66325632652bf8b72f24 (patch) | |
| tree | 11dfdf86dbcc0c84f993066da9b72a24e7cbdaca /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 9d60075ac2aeceb52e20fe48eb5866c09eeaa65b (diff) | |
| parent | 1db216ccc8455e317a16fec44ca30c139c4eca2b (diff) | |
[MERGE] resolve conflig of po files
bzr revid: ara@tinyerp.com-20101123105803-wklir8x8v7ri6ywp
bzr revid: ara@tinyerp.com-20101124054913-ragrrkytjad5udl0
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions