diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-02-29 15:39:58 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2012-02-29 15:39:58 +0530 |
| commit | 6873eb1616c7ffefc699b040604e034c7adbbd2f (patch) | |
| tree | 048a1d633862fe52c054c0d2c318db1b61ab39f8 | |
| parent | 927fe7d48dde76e7e32f36bb46e5edc33587413a (diff) | |
[IMP] remove conflict
bzr revid: tpa@tinyerp.com-20120229100958-621k7gheoi70p0th
| -rw-r--r-- | addons/sale/sale.py | 4 |
1 files changed, 0 insertions, 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" |