[IMP] resolve conflicts

bzr revid: psi@tinyerp.com-20120419065306-2ie570l1mpu9jegt

addons/mail/wizard/mail_compose_message.py

@@ -259,12 +259,7 @@ class mail_compose_message(osv.osv_memory):
                         attachments=attachment, references=references, res_id=int(mail.res_id),
                         subtype=mail.subtype, headers=headers, context=context)]
                 # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-<<<<<<< TREE
-                mail_message.send(cr, uid, [msg_id], context=context)
-=======
                 mail_message.send(cr, uid, msg_ids, context=context)
-
->>>>>>> MERGE-SOURCE
         return {'type': 'ir.actions.act_window_close'}
 
     def render_template(self, cr, uid, template, model, res_id, context=None):