You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tika.apache.org by ta...@apache.org on 2022/05/17 13:36:07 UTC

[tika] 02/03: Merge remote-tracking branch 'origin/main' into main

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 79781050f460133ebe8c1a305a4c72841ebfc0b3
Merge: 46d148fdc 3fa217103
Author: tallison <ta...@apache.org>
AuthorDate: Tue May 17 09:35:31 2022 -0400

    Merge remote-tracking branch 'origin/main' into main
    
    # Conflicts:
    #       tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java