From 9657c3319ffff8a29df65f15f836963e6d0c9faf Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 20 May 2010 09:52:15 +0530
Subject: [PATCH] [MERGE] Remove conflict

bzr revid: mra@tinyerp.com-20100520042215-8plhya8f9129lo8k
---
 addons/project/project_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c8f5d5ef75b..b3810420dc7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -629,11 +629,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
-<<<<<<< TREE
-            <field name="context">{"search_default_project_id":project_id, "search_default_my_msg":1, "search_default_user_id":uid}</field>
-=======
             <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid}</field>
->>>>>>> MERGE-SOURCE
             <field name="search_view_id" ref="view_project_message_search"/>
        </record>