From: Robert Pluim <rpluim@gmail.com>
Date: Fri, 17 Sep 2021 18:56:09 +0000 (+0200)
Subject: ; Fix etc/NEWS merge error
X-Git-Tag: emacs-28.0.90~885
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=174430e35186b1554eafe6ab1227ab9697224a56;p=emacs.git

; Fix etc/NEWS merge error

* etc/NEWS: fix merge error
---

diff --git a/etc/NEWS b/etc/NEWS
index 2201dd7a3b9..634d3d86f96 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -392,9 +392,6 @@ When customized to nil, it uses 'minibuffer-restore-windows' in
 'minibuffer-exit-hook' to remove only the window showing the
 "*Completions*" buffer.
 
-
-* Editing Changes in Emacs 28.1
-
 ---
 *** New variable 'redisplay-adhoc-scroll-in-resize-mini-windows'.
 Customizing it to nil will disable the ad-hoc auto-scrolling of