[lucene] branch branch_9x updated: fix merge problem in CHANGES.txt

[us...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 2638ff66af1 fix merge problem in CHANGES.txt
2638ff66af1 is described below

commit 2638ff66af1c37b552a8ee49cbffc776aa058611
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Fri Nov 11 17:36:08 2022 +0100

    fix merge problem in CHANGES.txt
---
 lucene/CHANGES.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index d161db20a4a..ece36dcf2e4 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -92,10 +92,6 @@ Build
 
 ======================== Lucene 9.4.2 =======================
 
-Improvements
----------------------
-* GITHUB#11916: improve checkindex to be more thorough for vectors. (Ben Trent)
-
 Bug Fixes
 ---------------------
 * GITHUB#11905: Fix integer overflow when seeking the vector index for connections in a single segment.
@@ -109,6 +105,8 @@ Improvements
   to the exception message. Allows better debugging and analysis of bugs like GITHUB#11905.
   (Uwe Schindler, Robert Muir)
 
+* GITHUB#11916: improve checkindex to be more thorough for vectors. (Ben Trent)
+
 ======================== Lucene 9.4.1 =======================
 
 Bug Fixes