diff options
| author | Christophe Simonis <chs@openerp.com> | 2011-11-08 16:56:33 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2011-11-08 16:56:33 +0100 |
| commit | 5290ada81f998e29da7777116e317478c69d05e6 (patch) | |
| tree | bf232b084f4e3194c510f850aeed2c8f45b236b7 /addons/web/static/src/xml/base.xml | |
| parent | 6e735ccbbee81d6be01f7c965e3248270aedc3cc (diff) | |
[FIX] correct criss-cross merge
bzr revid: chs@openerp.com-20111108155633-8lymglmg46sfv0ko
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
0 files changed, 0 insertions, 0 deletions