From 3c07ea7582c253d0fd2d312fcd8a41d3e8ac47a3 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 28 Oct 2010 23:01:25 +0530
Subject: [PATCH] [FIX] Purchase : conflict removed, thanks to Raphael

bzr revid: jvo@tinyerp.com-20101028173125-afyv9hrt32iw23t8
---
 addons/purchase/purchase_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 96f19c8d711..caa6790b537 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -147,11 +147,7 @@
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
-<<<<<<< TREE
-        <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-=======
-                <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
->>>>>>> MERGE-SOURCE
+								<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
 
                             </group>
                         </page>