diff options
| author | Mahendra Barad (OpenERP) <mba@tinyerp.com> | 2014-02-24 16:41:18 +0530 |
|---|---|---|
| committer | Mahendra Barad (OpenERP) <mba@tinyerp.com> | 2014-02-24 16:41:18 +0530 |
| commit | 8a95bef8df6c6c53fc081ea977d13a1343d15a4b (patch) | |
| tree | d176eea244194291878834b57fc8493612d9621b /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | e468f7f159ab4723a2d039eb7a621085e25fb122 (diff) | |
[IMP]resolve conflict
bzr revid: mba@tinyerp.com-20140224111118-ckxktrew1da6qh9n
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions