From ebb0595c549b3e2472bf2242e217c98c091d0f1e Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Mon, 11 Oct 2010 16:08:56 +0530
Subject: [PATCH] Removed the conflict

bzr revid: jni@tinyerp.com-20101011103856-dvfjcx75kpntp591
---
 addons/stock/stock_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1f624b8012..9e948ea2b77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1705,9 +1705,7 @@
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
                     </group>
-<<<<<<< TREE
-            <field name="name">Delivery Products vs Planned</field>
-=======
+
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
                         <field name="date" groups="base.group_extended"/>