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: Re: Conflicts in rmail.el Date: Tue, 15 Nov 2011 22:38:43 +0100 Message-ID: <87bosd2hi4.fsf@gmail.com> References: <87k4712lwk.fsf@gmail.com> <834ny5dtcd.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1321393143 25100 80.91.229.12 (15 Nov 2011 21:39:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 15 Nov 2011 21:39:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 15 22:38:59 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 1RQQiY-0005Wh-Pa for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 22:38:58 +0100 Original-Received: from localhost ([::1]:54346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQiY-0008Fo-7v for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 16:38:58 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:36829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQiT-0008Fh-BP for emacs-devel@gnu.org; Tue, 15 Nov 2011 16:38:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQQiP-0006Mt-ES for emacs-devel@gnu.org; Tue, 15 Nov 2011 16:38:53 -0500 Original-Received: from mail-bw0-f41.google.com ([209.85.214.41]:41804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQiP-0006MW-9k; Tue, 15 Nov 2011 16:38:49 -0500 Original-Received: by bke17 with SMTP id 17so7857054bke.0 for ; Tue, 15 Nov 2011 13:38:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=VNxyLdD9OH48BFPAK96lFX1XbPplj9lQhGM1ChGIKt8=; b=D4BBNDfSGvAPhSgWTF3AvWg68ZR+1XmHsVhXiB4ollOslNHc9d3Ond33zNYLoW89pZ xL9jB7xgmoZ0tkPpjEa9IsmyLhz3rLCcrlXeWFPNcGDrDB54upZIYxv/SQloTPaWwGDq CtK86YkGy7VS9waAXzrxv4zemfc7EZhPmfAy0= Original-Received: by 10.205.133.4 with SMTP id hw4mr25657611bkc.91.1321393127708; Tue, 15 Nov 2011 13:38:47 -0800 (PST) Original-Received: from thierry-MM061 (56.78.88.79.rev.sfr.net. [79.88.78.56]) by mx.google.com with ESMTPS id x27sm3295168fag.14.2011.11.15.13.38.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Nov 2011 13:38:46 -0800 (PST) In-Reply-To: <834ny5dtcd.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 15 Nov 2011 22:27:30 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.41 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:146046 Archived-At: Eli Zaretskii writes: >> From: Thierry Volpiatto >> Date: Tue, 15 Nov 2011 21:03:39 +0100 >> >> could someone fix existings conflicts in rmail.el? > > Just "bzr revert" and move on. Ok thanks. -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997