summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authorbth-openerp <bth@tinyerp.com>2013-07-16 14:36:53 +0530
committerbth-openerp <bth@tinyerp.com>2013-07-16 14:36:53 +0530
commit1d391ebb33d602316f2f467fd987767b62bc6f58 (patch)
tree2a6d0558d24b791fd0e66821151941e68231b640 /addons/analytic_user_function
parent81ff01a16f24df8671ec4399c0b6594b5eb51d38 (diff)
[FIX]Resolve conflicts.
bzr revid: bth@tinyerp.com-20130716090653-4xrtndazb02k2kof
Diffstat (limited to 'addons/analytic_user_function')
0 files changed, 0 insertions, 0 deletions