diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-09-11 14:11:32 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-09-11 14:11:32 +0200 |
| commit | c312cac0fa40c6bddd7785f29c6feaadd1ff384d (patch) | |
| tree | fd742c3575ed8e22a4a84e04d4442f48d83436c0 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | c48504fdba1ef68033c5e6c3b7929ea4e153d4b7 (diff) | |
[IMP] remove merged conflict
bzr revid: mat@openerp.com-20130911121132-47g2d267ld4b2cyl
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions