From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Conflicts in rmail.el
Date: Tue, 15 Nov 2011 22:27:30 +0200
Message-ID: <834ny5dtcd.fsf@gnu.org>
References: <87k4712lwk.fsf@gmail.com>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: lo.gmane.org
X-Trace: dough.gmane.org 1321388983 24622 80.91.229.12 (15 Nov 2011 20:29:43 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Tue, 15 Nov 2011 20:29:43 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 15 21:29:40 2011
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1RQPdT-0003ko-Dk
	for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 21:29:39 +0100
Original-Received: from localhost ([::1]:52181 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1RQPdT-0007ig-0c
	for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 15:29:39 -0500
Original-Received: from eggs.gnu.org ([140.186.70.92]:45889)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1RQPdL-0007dZ-MA
	for emacs-devel@gnu.org; Tue, 15 Nov 2011 15:29:32 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1RQPdI-0003NY-7U
	for emacs-devel@gnu.org; Tue, 15 Nov 2011 15:29:31 -0500
Original-Received: from mtaout22.012.net.il ([80.179.55.172]:61822)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1RQPdH-0003NK-Uy
	for emacs-devel@gnu.org; Tue, 15 Nov 2011 15:29:28 -0500
Original-Received: from conversion-daemon.a-mtaout22.012.net.il by
	a-mtaout22.012.net.il (HyperSendmail v2007.08) id
	<0LUP00000Y4Q8Y00@a-mtaout22.012.net.il> for
	emacs-devel@gnu.org; Tue, 15 Nov 2011 22:29:26 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([77.124.184.15]) by a-mtaout22.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0LUP000GXY8Y7220@a-mtaout22.012.net.il>;
	Tue, 15 Nov 2011 22:29:23 +0200 (IST)
In-reply-to: <87k4712lwk.fsf@gmail.com>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta)
X-Received-From: 80.179.55.172
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:146045
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/146045>

> From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
> Date: Tue, 15 Nov 2011 21:03:39 +0100
> 
> could someone fix existings conflicts in rmail.el?

Just "bzr revert" and move on.