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

[FIX] mail: fixed missing conflict resolution 

bzr revid: tde@openerp.com-20130411104659-ik62af6wubzu5j6q
This commit is contained in:
Thibault Delavallée 2013-04-11 12:46:59 +02:00
parent fe2ea997a2
commit 9e4486ae52
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mail/wizard/mail_compose_message.py
View File

@ -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