diff options
| author | ksa (Open ERP) <ksa@tinyerp.co.in> | 2010-06-01 11:38:21 +0530 |
|---|---|---|
| committer | ksa (Open ERP) <ksa@tinyerp.co.in> | 2010-06-01 11:38:21 +0530 |
| commit | b0bd8bce74ed46d7287c58778416cba6b903eaa7 (patch) | |
| tree | 4205a449886d20dd3d8376d5ac29062d8aa6af91 /python25-compat | |
| parent | 62bfe8dcaf77b651103cb71c929684b388cc5563 (diff) | |
[IMP] Remove conflict
bzr revid: ksa@tinyerp.co.in-20100601060821-15gm6j5jqgn3nhss
Diffstat (limited to 'python25-compat')
0 files changed, 0 insertions, 0 deletions