This is an automated email from the ASF dual-hosted git repository. tallison pushed a change to branch TIKA-4635 in repository https://gitbox.apache.org/repos/asf/tika.git
was 2648008c00 TIKA-4635 -- fix bad merge conflict resolution on test file
and rename getter to avoid complaints from Jackson
The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.
