Conflicts in rmail.el

[Thierry Volpiatto]

Hi,
could someone fix existings conflicts in rmail.el?

--8<---------------cut here---------------start------------->8---
Text conflict in lisp/mail/rmail.el
Conflict adding file lisp/mail/rmail.el.BASE.  Moved existing file to 
lisp/mail/rmail.el.BASE.moved.
Conflict adding file lisp/mail/rmail.el.OTHER.  Moved existing file to 
lisp/mail/rmail.el.OTHER.moved.
Conflict adding file lisp/mail/rmail.el.THIS.  Moved existing file to 
lisp/mail/rmail.el.THIS.moved.
--8<---------------cut here---------------end--------------->8---

--8<---------------cut here---------------start------------->8---
;;;***

<<<<<<< TREE
<<<<<<< TREE
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"b20346e7178c45a313b9cabd004c21fb")
=======
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"5d992206e382290d07ad7d9a2bf250c9")
>>>>>>> MERGE-SOURCE
=======
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"a79f498959deded8fa9d88a7dca93bc0")
>>>>>>> MERGE-SOURCE
;;; Generated autoloads from rmailmm.el
--8<---------------cut here---------------end--------------->8---

Thanks.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997