diff options
| author | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-05-24 17:13:46 +0530 |
|---|---|---|
| committer | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-05-24 17:13:46 +0530 |
| commit | 33a108d34bf967f34b3a8bf56f8db7f06d825f1e (patch) | |
| tree | d209fc6ac42a432dc32016ca6a3db63130fb5bcd /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 5a54d4c5ddd7f1d776ac9a2e13b892a46ab2a152 (diff) | |
[IMP]remove conflict
bzr revid: mma@tinyerp.com-20120524114346-wlvze80237fa37rt
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions