From 233670d681a2fd045abd7a110e7097315a9aa5b2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 11 Aug 2014 16:03:41 +0200
Subject: [PATCH] [FIX] ir_cron: forgotten conflict from forward port
 ae65be2b2ae98860f70a7e6f3d7679c40ea9bd93

---
 openerp/addons/base/ir/ir_cron.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index 055c0d8bf5ab..ed880ab0bd83 100644
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -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
-- 
GitLab