; Fix merge errors

diff --git a/etc/NEWS b/etc/NEWS
index 4efa75fce21a43ec66cd6cf99db9088d4e9e1a6c..af7f1050b763a0fa01abd144d384e24a2628e957 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -99,14 +99,6 @@ point is not in a comment or a string.  It is by default bound to
 \f
 * Incompatible Lisp Changes in Emacs 30.1
 
-*** New major mode 'go-ts-mode'.
-A major mode based on the tree-sitter library for editing programs in
-the Go language.  It is auto-enabled for files with the ".go" extension.
-
-*** New major mode 'go-mod-ts-mode'.
-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".
-
 \f
 * Lisp Changes in Emacs 30.1
 

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 701e414fdbbbcb02234c0d48f49f89f32a1fb0f3..dd11b3c271509a3ab910485bda0568ec76b59754 100644 (file)
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -3081,6 +3081,14 @@ A major mode based on the tree-sitter library for editing files
 written in TOML, a format for writing configuration files.  It is
 auto-enabled for files with the ".toml" extension.
 
+*** New major mode 'go-ts-mode'.
+A major mode based on the tree-sitter library for editing programs in
+the Go language.  It is auto-enabled for files with the ".go" extension.
+
+*** New major mode 'go-mod-ts-mode'.
+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".
+
 \f
 * Incompatible Lisp Changes in Emacs 29.1