diff options
| author | Stephane Wirtel <stw@openerp.com> | 2012-05-23 13:45:20 +0200 |
|---|---|---|
| committer | Stephane Wirtel <stw@openerp.com> | 2012-05-23 13:45:20 +0200 |
| commit | 859f59f156315844baff673bd90d359f1d712cc7 (patch) | |
| tree | 6c006349aa70b4d4de01db44331916b0a8847280 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 5ee1007bf2483cb8b1d8ebfd1daa49973ec2648b (diff) | |
[FIX] account: fix some conflicts from a previous merge
bzr revid: stw@openerp.com-20120523114520-85zzx9efwqtu48ry
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions