diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-14 09:53:15 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-14 09:53:15 +0100 |
| commit | 70ce1e5eb4586d6f08248430fe6bee9360dba285 (patch) | |
| tree | e92588957506838d97bdf382112190b56603a260 /addons/web/static/src/js/coresetup.js | |
| parent | 272501d66cc08ea6f821cba3d5736facae444f45 (diff) | |
[FIX] Fixed forgotten conflict when merging trunk.
bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
0 files changed, 0 insertions, 0 deletions