[IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072552-fmu0a40ohew417qf
This commit is contained in:
Hardik Ansodariy (OpenERP)
2011-07-26 12:55:52 +05:30
parent 5b6285ba7a
commit 2196d27716
+1 -1
View File
@@ -12,7 +12,7 @@
<field name="arch" type="xml">
<form string="mailgate message">
<group colspan="4" col="6">
<field name="name" string="Subject" required="1" select="1" widget="char" size="512"/>
<field name="name" string="Subject" select="1" widget="char" size="512"/>
<field name="date" required="1" select="1"/>
<field name="user_id" string="Owner" select="1"/>
<field name="partner_id" readonly="1" />