From a5889f97b771e06d057ec7a779d8f37df5f8ba84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 25 Jun 2012 10:59:23 +0200
Subject: [PATCH] [FIX] crm_phonecall_view: removed a merge-source line coming
 from merge conflict. Damn you ol' man bzr diff

bzr revid: tde@openerp.com-20120625085923-wp4ulcsix2fhjt1g
---
 addons/crm/crm_phonecall_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9a62cf73b4c..04f3d1e915f 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -212,7 +212,6 @@
                        context="{'group_by':'date'}" help="Date of Call" />
                </group>
            </search>
->>>>>>> MERGE-SOURCE
         </field>
     </record>