[REM] point_of_sale: Remove the conflict

bzr revid: sbh@tinyerp.com-20100329070335-q4acrhpqt33v7y0n

diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 7bdece3..719729a 100644 (file)
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -22,21 +22,6 @@
                        rml="point_of_sale/report/account_statement.rml"
                         />
 
-               <!--report
-                       id="all_closed_cashbox_of_the_day"
-                       string="All Cloded CashBOx"
-                       model="account.bank.statement"
-                       name="all.closed.cashbox.of.the.day"
-                       auto="False"
-                       multi="True"
-                       menu = 'False'
-<<<<<<< TREE
-                       rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-                        /-->
-=======
-                       rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-                        />
->>>>>>> MERGE-SOURCE
                <report
                        id="pos_users_product_re"
                        string="User's Product"