From 6873eb1616c7ffefc699b040604e034c7adbbd2f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 29 Feb 2012 15:39:58 +0530
Subject: [PATCH] [IMP] remove conflict

bzr revid: tpa@tinyerp.com-20120229100958-621k7gheoi70p0th
---
 addons/sale/sale.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9dc4781e26c..552246f2513 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -28,11 +28,7 @@ from tools.translate import _
 from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, float_compare
 import decimal_precision as dp
 import netsvc
-<<<<<<< TREE
-from openerp.addons.base.res import res_config_sale as sale_config
-=======
 #from openerp.addons.base.res import res_config_sale as sale_config
->>>>>>> MERGE-SOURCE
 
 class sale_shop(osv.osv):
     _name = "sale.shop"