[FIX]: conflict error
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Mon, 18 Apr 2011 06:43:35 +0000 (12:13 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Mon, 18 Apr 2011 06:43:35 +0000 (12:13 +0530)
commit2c576c4960e0913f4b6575f9b3212c223c389cb7
treec34600a69e9b522c1960d7d1ac9aacb308277b35
parent464031dc828fcf2a3e95bf92c43484273c73f349
[FIX]: conflict error

bzr revid: rha@tinyerp.com-20110418064335-8bt6dbql286loyvd
addons/project_issue/project_issue.py