From 345aaa503ddaa0eb103bdd291bc337eb19f11de9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 15 May 2012 11:54:25 +0530
Subject: [PATCH] [IMP]crm: remove conflicts

bzr revid: dbr@tinyerp.com-20120515062425-n158ost14j62l9oo
---
 addons/crm/crm_lead.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9e97de8359c..08cd2acb03e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -228,21 +228,11 @@ class crm_lead(crm_case, osv.osv):
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
     
-<<<<<<< TREE
-    def on_change_optin(self, cr, uid, ids, optin):
-        return {'value':{'optin':optin,'opt_out':False}}
-=======
     def on_change_opt_in(self, cr, uid, ids, opt_in):
         return {'value':{'opt_in':opt_in,'opt_out':False}}
->>>>>>> MERGE-SOURCE
 
-<<<<<<< TREE
-    def on_change_optout(self, cr, uid, ids, optout):
-        return {'value':{'opt_out':optout,'optin':False}}
-=======
     def on_change_opt_out(self, cr, uid, ids, opt_out):
         return {'value':{'opt_out':opt_out,'opt_in':False}}
->>>>>>> MERGE-SOURCE
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id: