diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-02-29 15:39:58 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-02-29 15:39:58 +0530 |
| commit | 6873eb1616c7ffefc699b040604e034c7adbbd2f (patch) | |
| tree | 048a1d633862fe52c054c0d2c318db1b61ab39f8 /addons/plugin_thunderbird/plugin_thunderbird.xml | |
| parent | 927fe7d48dde76e7e32f36bb46e5edc33587413a (diff) | |
[IMP] remove conflict
bzr revid: tpa@tinyerp.com-20120229100958-621k7gheoi70p0th
Diffstat (limited to 'addons/plugin_thunderbird/plugin_thunderbird.xml')
0 files changed, 0 insertions, 0 deletions