diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-07-27 16:12:28 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-07-27 16:12:28 +0200 |
| commit | 8bea1218b1d28956f6aba7e687c3d998661959ca (patch) | |
| tree | 6f1eb859f8136edab93581dfb23e00624563a473 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 68c2802fd9e02ad6f3885a3b4a2850919ad70f51 (diff) | |
[WIP] resolving conflicts generated by the **** bisect plugin
bzr revid: fva@openerp.com-20120727141228-45h9ir2njvq7hgqd
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions