[IMP]: sale_crm: resolve conflict for wizard.

bzr revid: atp@tinyerp.co.in-20100608115159-7k2y2hfw5ol3fvxv
2010-06-08 17:21:59 +05:30
parent 2907ce2862
commit 0a9c028757
1 changed files with 0 additions and 1 deletions
@@ -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 """