diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2011-12-13 11:34:33 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2011-12-13 11:34:33 +0530 |
| commit | 5f583e89c05851337b3827abbb8cc5c3ecb98440 (patch) | |
| tree | e475ab05e3d219a7f55f04257064e604ebc8f11e /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 23129a004d42a90f6d0258ef715a2e4bdbccf1cb (diff) | |
[IMP] remove conflict
bzr revid: tpa@tinyerp.com-20111213060433-s92xmflr48p9wny1
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions