This is an automated email from the ASF dual-hosted git repository.
tballison pushed a change to branch TIKA-476x-merge-conflicts
in repository https://gitbox.apache.org/repos/asf/tika.git
at 4d91c53f28 TIKA-4764 and TIKA-4763 merge conflicts
This branch includes the following new commits:
new 4d91c53f28 TIKA-4764 and TIKA-4763 merge conflicts
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.
