From 2196d2771613f106a282a2b53cfde01f868ec13c Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 26 Jul 2011 12:55:52 +0530
Subject: [PATCH] [IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072552-fmu0a40ohew417qf
---
 addons/mail_gateway/mail_gateway_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index d05bfbc0d91..6b36b87b545 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -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" />