[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
2012-06-25 10:59:23 +02:00
parent 6b0c9da359
commit a5889f97b7
1 changed files with 0 additions and 1 deletions
@@ -212,7 +212,6 @@
                       context="{'group_by':'date'}" help="Date of Call" />
               </group>
           </search>
->>>>>>> MERGE-SOURCE
        </field>
    </record>