diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-05-20 09:52:15 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-05-20 09:52:15 +0530 |
| commit | 9657c3319ffff8a29df65f15f836963e6d0c9faf (patch) | |
| tree | 701d601be7805506423a99dad10382d5de7bf4ea /addons/project_long_term/project_long_term.py | |
| parent | 1ab525acdafec51ee9d68076a0cda5d8f223c4b0 (diff) | |
[MERGE] Remove conflict
bzr revid: mra@tinyerp.com-20100520042215-8plhya8f9129lo8k
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
0 files changed, 0 insertions, 0 deletions