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
from 42309dd7d9 TIKA-4635 - checkstyle
add 2648008c00 TIKA-4635 -- fix bad merge conflict resolution on test file
and rename getter to avoid complaints from Jackson
No new revisions were added by this update.
Summary of changes:
tika-core/src/main/java/org/apache/tika/digest/DigestDef.java | 2 +-
.../java/org/apache/tika/parser/digestutils/BouncyCastleDigester.java | 4 ++--
.../main/java/org/apache/tika/parser/digestutils/CommonsDigester.java | 4 ++--
.../src/test/resources/configs/tika-config-write-limiter.json | 1 -
4 files changed, 5 insertions(+), 6 deletions(-)
