diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-20 10:23:42 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-01-20 10:23:42 +0100 |
| commit | f529de5625f318f01db5c9a99c66b905caad7e5a (patch) | |
| tree | 834ee6f07c2a15c86b203a5132eee47e6c108b08 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | b3cf924bf83a866c8b0120188d39f956ab9d6fd1 (diff) | |
[FIX] Fixing merge problems
bzr revid: rim@openerp.com-20140120092342-k2dh91lwiktasf2v
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions