From 6de7c24b14f5f10413c562a67c5a2e37c4fa4f5c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 13 Jan 2010 09:19:06 +0100
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100113081906-urwpl9q77mqhfdgn
---
 addons/crm/crm.py               | 1 -
 addons/crm/crm_meeting_data.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 20e6fe63a01..19121dcd972 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -864,4 +864,3 @@ users()
 
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index c3244e88f3f..540133d6753 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -4,7 +4,7 @@
 
     <record model="crm.case.section" id="section_support1">
         <field name="name">Meetings</field>
-        <field name="code">Mtngs</field>        
+        <field name="code">Mtngs</field>
     </record>
         <!--    CASE CATEGORY(categ_id)        -->