diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-09-11 14:11:07 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-09-11 14:11:07 +0200 |
| commit | 57f2b2f90960d2883155fdba413d665858d27c8e (patch) | |
| tree | ee7a1aaf6f29d2b90174921f06e0bccec34386ad /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | dde8c1891ddb21384164e9ab98c6330ab726043b (diff) | |
[FIX] Fixed conflict that I has not seen.
bzr revid: tde@openerp.com-20120911121107-surc6mwhfldsa541
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions