diff options
| author | Olivier Dony <odo@openerp.com> | 2015-07-31 11:02:12 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-07-31 11:04:20 +0200 |
| commit | eec95afaac04cfe36dd24f7c19b6c86e791e8c72 (patch) | |
| tree | 07c01abc16fd6eab850a21e4ee7a4f98e806bf49 /addons/web/static/src | |
| parent | d38359821c2dbadccd9f1047124f5636df6bdc89 (diff) | |
[FIX] pos: malformed XML due to wrong conflict resolution in forward-port
XML syntax error introduced in forward-port d38359821c2dbadccd9f1047124f5636df6bdc89
due to conflicts when porting commit 96f0c28b3d66ae174765d271732043581b285c61
Diffstat (limited to 'addons/web/static/src')
0 files changed, 0 insertions, 0 deletions