diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-11-29 12:23:50 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-11-29 12:23:50 +0100 |
| commit | a2b23a1ca71a25f912c5f92e8a1dbfdde69bc568 (patch) | |
| tree | a7d25dab181b17f76f7d9616a73b3f905f5c69da /addons/web/static/src | |
| parent | c4a845b50e2ca2c6750a512e1980282e4d6d57a3 (diff) | |
[REM] merge conflict file committed
bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6
Diffstat (limited to 'addons/web/static/src')
0 files changed, 0 insertions, 0 deletions