diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2012-10-31 12:02:28 +0100 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2012-10-31 12:02:28 +0100 |
| commit | 498a30bf627cf8e99b599bfb265d7868721f93cf (patch) | |
| tree | 521aca293295f35eb935544d85d1b26e4e4e0cf2 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | cf1f8acda1a68f8b961b1ec6937ddd30b6dfa1db (diff) | |
[FIX]fix conflict problem for event/event_view.xml in order to match current trunk
bzr revid: csn@openerp.com-20121031110228-pvnkce2c6fdsfkuv
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions