This is an automated email from the ASF dual-hosted git repository. tallison pushed a change to branch TIKA-4607-main in repository https://gitbox.apache.org/repos/asf/tika.git
was c17b01d497 TIKA-4607 -- fix merge conflict
The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.
