[REM] point_of_sale: Remove the conflict
authorsbh (Open ERP) <sbh@tinyerp.com>
Mon, 29 Mar 2010 07:03:35 +0000 (12:33 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Mon, 29 Mar 2010 07:03:35 +0000 (12:33 +0530)
commit8756f1f7c4064da5011cf03ff0499085912ab382
treeb08e22d492ceae5404ac0df45b03c6f07c7e3c88
parenta7adad39c28e5b414b190168b6d311127548f640
[REM] point_of_sale: Remove the conflict

bzr revid: sbh@tinyerp.com-20100329070335-q4acrhpqt33v7y0n
addons/point_of_sale/statement_report.xml