From 33a108d34bf967f34b3a8bf56f8db7f06d825f1e Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 24 May 2012 17:13:46 +0530
Subject: [PATCH] [IMP]remove conflict

bzr revid: mma@tinyerp.com-20120524114346-wlvze80237fa37rt
---
 addons/purchase/purchase_view.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ceca2ed92c7..7eec22c5ccf 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -207,17 +207,10 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
-<<<<<<< TREE
-                    </sheet>
-                    <div class="oe_form_sheet_width">
-                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
-=======
                 </sheet>
                 <div class="oe_form_sheet_width">
                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
->>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>