master 6c842ef81c 8/8: ; Fix merge errors in etc/NEWS

[Stefan Kangas]

branch: master
commit 6c842ef81c28b5ca8d2255c3ccb91df8a11c971a
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    ; Fix merge errors in etc/NEWS
---
 etc/NEWS    | 10 ----------
 etc/NEWS.29 | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 00f9690415..af7f1050b7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -38,11 +38,6 @@ connection.
 
 * Editing Changes in Emacs 30.1
 
----
-*** New input method 'cyrillic-chuvash'.
-This input method is based on the russian-computer, and is intended
-for the Chuvash language written in the Cyrillic script.
-
 
 * Changes in Specialized Modes and Packages in Emacs 30.1
 ---
@@ -104,11 +99,6 @@ point is not in a comment or a string.  It is by default 
bound to
 
 * Incompatible Lisp Changes in Emacs 30.1
 
-*** New major mode 'yaml-ts-mode'.
-A major mode based on the tree-sitter library for editing files
-written in YAML.  It is auto-enabled for files with the ".yaml" or
-".yml" extensions.
-
 
 * Lisp Changes in Emacs 30.1
 
diff --git a/etc/NEWS.29 b/etc/NEWS.29
index e1864e2117..017fd850b4 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -1411,6 +1411,11 @@ language.
 This is a variant of the 'slovak' input method, which corresponds to
 the QWERTY Slovak keyboards.
 
+---
+*** New input method 'cyrillic-chuvash'.
+This input method is based on the russian-computer, and is intended
+for the Chuvash language written in the Cyrillic script.
+
 
 * Changes in Specialized Modes and Packages in Emacs 29.1
 
@@ -3143,6 +3148,11 @@ the Go language.  It is auto-enabled for files with the 
".go" extension.
 A major mode based on the tree-sitter library for editing "go.mod"
 files.  It is auto-enabled for files which are named "go.mod".
 
+*** New major mode 'yaml-ts-mode'.
+A major mode based on the tree-sitter library for editing files
+written in YAML.  It is auto-enabled for files with the ".yaml" or
+".yml" extensions.
+
 *** New major mode 'rust-ts-mode'.
 A major mode based on the tree-sitter library for editing programs in
 the Rust language.  It is auto-enabled for files with the ".rs" extension.