diff options
| author | Jay (Open ERP) <jvo@tinyerp.com> | 2010-05-26 10:59:21 +0530 |
|---|---|---|
| committer | Jay (Open ERP) <jvo@tinyerp.com> | 2010-05-26 10:59:21 +0530 |
| commit | 17a30e204c4350b31043b00ec366c0fe8d6da56e (patch) | |
| tree | 6ba592247bb03b5a1f311d178768bfdd38f6498e /addons/project_long_term/project_long_term.py | |
| parent | 2f1a084e8449810edec3693f4f2cc50cb206d854 (diff) | |
[FIX] Resolved a committed conflict
bzr revid: jvo@tinyerp.com-20100526052921-6k18mel3o6u6mcr3
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
0 files changed, 0 insertions, 0 deletions
