From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.devel Subject: Conflicts in rmail.el Date: Tue, 15 Nov 2011 21:03:39 +0100 Message-ID: <87k4712lwk.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1321387447 13315 80.91.229.12 (15 Nov 2011 20:04:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 15 Nov 2011 20:04:07 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 15 21:04:02 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RQPEg-0007i1-3r for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 21:04:02 +0100 Original-Received: from localhost ([::1]:34501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQPEf-0002HF-IC for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 15:04:01 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:57294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQPEc-0002DU-5S for emacs-devel@gnu.org; Tue, 15 Nov 2011 15:03:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQPEb-0001TI-6P for emacs-devel@gnu.org; Tue, 15 Nov 2011 15:03:58 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:59728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQPEa-0001T0-Tr for emacs-devel@gnu.org; Tue, 15 Nov 2011 15:03:57 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RQPEY-0007dB-DL for emacs-devel@gnu.org; Tue, 15 Nov 2011 21:03:54 +0100 Original-Received: from 56.78.88.79.rev.sfr.net ([79.88.78.56]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 15 Nov 2011 21:03:54 +0100 Original-Received: from thierry.volpiatto by 56.78.88.79.rev.sfr.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 15 Nov 2011 21:03:54 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 31 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 56.78.88.79.rev.sfr.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) Cancel-Lock: sha1:Q66GNsif14EuAvpKVngCo7uNvIA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 80.91.229.12 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:146044 Archived-At: 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