diff options
| author | Olivier Dony <odo@openerp.com> | 2015-01-20 10:32:31 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-01-20 10:33:04 +0100 |
| commit | 025a81225b8482a02c9dd515fa25cbce52f0dfb2 (patch) | |
| tree | a585b4698eef991836aae9f5f842a297bc13ba60 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 8f30139b659de9d94b5f43a590d754fdbe0e0fe8 (diff) | |
[FIX] website_forum: bad conflict resolution during last forward-port
kdiff3 use should be forbidden :-)
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions