diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2013-10-22 09:24:38 +0200 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2013-10-22 09:24:38 +0200 |
| commit | 55a53ec9ef36241aa1d06864bb98713020244901 (patch) | |
| tree | 48ae5602e3dfe103f9f4d1acb099ea4f37a6a97a /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | ad0c739aa8f25da6820c238a93a16b3cd1093c53 (diff) | |
| parent | 1a3acf0edc862087e38d7ce63f59c5411b649c61 (diff) | |
[MER] Resolving conflicts
bzr revid: rim@openerp.com-20131022072438-1aucyd1epcunohd1
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions