diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-04-19 12:23:06 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-04-19 12:23:06 +0530 |
| commit | 6dbbf9e79d16f83d46087b50466c34827823e582 (patch) | |
| tree | ebc3a84de6ae2a612158e157a3361324238a9d1e /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 735c6d594634df5884d91a5cb756a4985de9c4ce (diff) | |
[IMP] resolve conflicts
bzr revid: psi@tinyerp.com-20120419065306-2ie570l1mpu9jegt
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions