diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-05-30 11:03:06 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-05-30 11:03:06 +0200 |
| commit | 080b473d1d36856057c37d3a0503ae35ee28ecd6 (patch) | |
| tree | dc81b6fd60a0c7a20cc90adb7c2b9802d959c7c9 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 514203743d3f8fbdaf2f976972aa0a20e202cc07 (diff) | |
[FIX] fix wrong conflict resolution in merge
The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master. This commit resolves
the issue correctly.
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions