odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] ir_cron: forgotten conflict from forward port ae65be2b2a

This commit is contained in:
Denis Ledoux 2014-08-11 16:03:41 +02:00
parent ae65be2b2a
commit 233670d681
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/addons/base/ir/ir_cron.py
View File

@ -27,11 +27,7 @@ from dateutil.relativedelta import relativedelta
import pytz
import openerp
<<<<<<< HEAD
from openerp import SUPERUSER_ID, netsvc, api
=======
from openerp import netsvc, SUPERUSER_ID
>>>>>>> 0739bc4edabab7e74571087c01a2da68ccadb10e
from openerp.osv import fields, osv
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools.safe_eval import safe_eval as eval