This is an automated email from the ASF dual-hosted git repository. cpoerschke pushed a commit to branch jira/solr-13350 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 65f9a4e561ac7cfbe71f370428bf253a5a98c110 Merge: 43be691c4f3 065d21abb42 Author: Christine Poerschke <[email protected]> AuthorDate: Tue Feb 20 18:04:39 2024 +0000 Merge remote-tracking branch 'origin/main' into jira/solr-13350 Resolved Conflicts: solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
