diff options
| author | Denis Ledoux dle@openerp.com <> | 2012-10-18 17:23:10 +0200 |
|---|---|---|
| committer | Denis Ledoux dle@openerp.com <> | 2012-10-18 17:23:10 +0200 |
| commit | ed3bd219a3ed820eac23fb8d78c1d00ae88498b3 (patch) | |
| tree | 6e425b3f9fc520ab94749ca29194832ef9918592 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 5e3fd05affd1ce6af45af00f920711bb33119c0d (diff) | |
| parent | 910799a8a297515df0e485d2d6d18dfa932ba477 (diff) | |
[FIX]Resolve conflict in demo
bzr revid: dle@openerp.com-20121018152310-hjd8mqyl38ulp12b
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions