This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9_9
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_9 by this push:
new cba01d99cff Remove merge line in CHANGES.txt
cba01d99cff is described below
commit cba01d99cff419b5ee0609513beccd3c5c50dd13
Author: Houston Putman <[email protected]>
AuthorDate: Tue Jul 8 15:38:30 2025 -0600
Remove merge line in CHANGES.txt
---
solr/CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4b08b703d8e..0d7a0ab90c3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -578,8 +578,6 @@ Other Changes
* SOLR-16996: Update Solr Exporter for Prometheus cli to use commons-cli
instead of argparse4j. (Christos Malliaridis via Eric Pugh)
->>>>>>> origin/branch_9x
-
================== 9.6.1 ==================
Bug Fixes
---------------------
