This is an automated email from the ASF dual-hosted git repository. tallison pushed a change to branch TIKA-4637 in repository https://gitbox.apache.org/repos/asf/tika.git
from 3812cf9f90 TIKA-4637 -- fix merge conflicts
add 005286e8b2 TIKA-4637 -- fix test
No new revisions were added by this update.
Summary of changes:
.../test/java/org/apache/tika/cli/TikaCLITest.java | 24 +++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
