From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: master 5fe9375 2/3: Merge from origin/emacs-26
Date: Tue, 14 May 2019 20:38:00 -0400
Message-ID: <xl7eas7dsn.fsf@fencepost.gnu.org>
References: <20190515001827.19811.454@vcs0.savannah.gnu.org>
	<20190515001830.743C9206A2@vcs0.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain
Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226";
	logging-data="93932"; mail-complaints-to="usenet@blaine.gmane.org"
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
Cc: emacs-devel@gnu.org
To: Stefan Monnier <monnier@iro.umontreal.ca>,
	Noam Postavsky <npostavs@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 15 02:38:45 2019
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 ([209.51.188.17])
	by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256)
	(Exim 4.89)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1hQhwS-000OLG-1s
	for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 02:38:44 +0200
Original-Received: from localhost ([127.0.0.1]:56977 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 1hQhwR-00079M-0d
	for ged-emacs-devel@m.gmane.org; Tue, 14 May 2019 20:38:43 -0400
Original-Received: from eggs.gnu.org ([209.51.188.92]:50053)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1hQhvp-000793-6J
	for emacs-devel@gnu.org; Tue, 14 May 2019 20:38:05 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:46216)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1hQhvo-0003zC-Ge; Tue, 14 May 2019 20:38:04 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82)
	(envelope-from <rgm@gnu.org>)
	id 1hQhvm-00015W-BM; Tue, 14 May 2019 20:38:02 -0400
X-Spook: Weapons cache munitions STARLAN [Hello to all my friends
X-Ran: 8;@[C0{>&U=N6)dl:n\?Fh:H-mvX`LUY"Pg#N*$f}5av$1vDqdSW-whFrG%T|h=+)9&O&R
X-Hue: cyan
X-Attribution: GM
In-Reply-To: <20190515001830.743C9206A2@vcs0.savannah.gnu.org> (Glenn Morris's
	message of "Tue, 14 May 2019 20:18:30 -0400 (EDT)")
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.21
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" <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.devel:236526
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/236526>


> branch: master
> commit 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7
> Merge: 0f63e17 02bee78

>     # Conflicts:
>     #	lisp/textmodes/sgml-mode.el

Please could you check the resolution of this conflict?