From 9e4486ae528e97e364e995b5bb3396f1e6b0dd84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 11 Apr 2013 12:46:59 +0200 Subject: [PATCH] [FIX] mail: fixed missing conflict resolution bzr revid: tde@openerp.com-20130411104659-ik62af6wubzu5j6q --- addons/mail/wizard/mail_compose_message.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 205fa3a8ef0..301dff515b3 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -21,11 +21,7 @@ import re from openerp import tools -<<<<<<< TREE -======= - from openerp import SUPERUSER_ID ->>>>>>> MERGE-SOURCE from openerp.osv import osv from openerp.osv import fields from openerp.tools.safe_eval import safe_eval as eval