diff options
| author | Atik Agewan (OpenERP) <aag@tinyerp.com> | 2011-10-19 12:09:51 +0530 |
|---|---|---|
| committer | Atik Agewan (OpenERP) <aag@tinyerp.com> | 2011-10-19 12:09:51 +0530 |
| commit | e09b1ac9e40fdbb6e3c15c18fea3aaa4a09a1ff5 (patch) | |
| tree | b527ef0c7e0dcb4f3f014c3b12a5713a41f61aeb /addons/analytic_user_function/analytic_user_function.py | |
| parent | d84349a627fedf0bfaa49b8cd40db563e91ce646 (diff) | |
[REM] stock:Remove conflict
bzr revid: aag@tinyerp.com-20111019063951-zitfegd2903a7zrr
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
0 files changed, 0 insertions, 0 deletions