[MERGE]merge

bzr revid: sgo@tinyerp.com-20120906094801-d1gkx5ptsawczx7o
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-09-06 15:18:01 +05:30
+2 -3
View File
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<data noupdate="1">
<record id="mail.mail_subtype_new" model="mail.message.subtype">
<field name="name">new</field>
<field name="model_ids" eval="[(4,ref('mrp_repair.model_mrp_repair'))]"/>
@@ -44,5 +43,5 @@
<record id="mail.mail_subtype_other" model="mail.message.subtype">
<field name="model_ids" eval="[(4,ref('mrp_repair.model_mrp_repair'))]"/>
</record>
</data>
</data>
</openerp>