diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-07-30 11:19:46 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-07-30 11:19:46 +0200 |
| commit | b9d62abd9a3d26dded49f74edd8f253b57b5ed73 (patch) | |
| tree | 3cde5f834fa4b583bb327912e6bf80d5b04b227c /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 9e3844d666e14365f9f71c77a0c1ba7b4e984e25 (diff) | |
[FIX] point of sale: removed forgotten tree/merge, probably due to a forgotten conflict to resolve.
bzr revid: tde@openerp.com-20120730091946-3ml79eb6u4flzina
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions