This is an automated email from the ASF dual-hosted git repository.
tballison pushed a change to branch TIKA-4797-fix-settrusted
in repository https://gitbox.apache.org/repos/asf/tika.git
at 67ec66ac15 Fix merge problem
This branch includes the following new commits:
new 67ec66ac15 Fix merge problem
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
