[IMP] remove conflict

bzr revid: tpa@tinyerp.com-20120229100958-621k7gheoi70p0th
2012-02-29 15:39:58 +05:30
parent 927fe7d48d
commit 6873eb1616
1 changed files with 0 additions and 4 deletions
@@ -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"