This is an automated email from the ASF dual-hosted git repository. tballison pushed a change to branch TIKA-4221-main in repository https://gitbox.apache.org/repos/asf/tika.git
was 5ea3a4fad5 TIKA-4221 -- temporary workaround for COMPRESS-675 (#1686)
-- fix merge conflicts
The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.
