This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 7ad377f5056 Remove merge line in CHANGES.txt
7ad377f5056 is described below
commit 7ad377f505665a41ccba35c0aed10a39e22884ba
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 8273e22a739..0e2b84e2270 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -595,8 +595,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
---------------------
