diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-16 11:55:08 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-16 11:55:08 +0100 |
| commit | a00d24988f123d6ff2e9eaa9e164187c7022f9c9 (patch) | |
| tree | fff613d34b12580c29e38d3ad3531ce23a68eb55 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 9cf78e93ccb6051731355e4ba5931a532b1f7f28 (diff) | |
[FIX] product: fixed file whose conflicts markers where still alive. Alive bzr diff
bzr revid: tde@openerp.com-20140116105508-qfxgox7rvo1ifjtj
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions