From 0a9c028757641b98499457958e626a2c016e2dcd Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 8 Jun 2010 17:21:59 +0530
Subject: [PATCH] [IMP]: sale_crm: resolve conflict for wizard.

bzr revid: atp@tinyerp.co.in-20100608115159-7k2y2hfw5ol3fvxv
---
 addons/sale_crm/wizard/crm_make_sale.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 6d688698db5..f53ce3d24d5 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -23,7 +23,6 @@ from osv import fields, osv
 from tools.translate import _
 from mx.DateTime import now
 
-<<<<<<< TREE
 
 class crm_make_sale(osv.osv_memory):
     """ Make sale  order for crm """