pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Remove conflict

Browse Source 
bzr revid: mra@tinyerp.com-20100520042215-8plhya8f9129lo8k
This commit is contained in:
mra (Open ERP)
2010-05-20 09:52:15 +05:30
parent 1ab525acda
commit 9657c3319f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
-4
View File
@@ -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>