This is an automated email from the ASF dual-hosted git repository. mattmann pushed a commit to branch gsoc17 in repository https://gitbox.apache.org/repos/asf/tika.git
commit 79f4b4e3883e53f54c9116aedd44cab1a13c8b3c Merge: 0e1abd2 c6b6b17 Author: Chris Mattmann <[email protected]> AuthorDate: Fri Sep 1 13:35:34 2017 -0700 fix conflicts in CHANGES.txt during merge CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc CHANGES.txt index c826bab,ccbdfe9..06751a6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -9,7 -9,7 +9,7 @@@ Release 1.17 - ?? * Tika now has support for automatic image captioning, that combines Computer Vision and Natural Language Processing to automatically generate a readable caption for an image - (TIKA-2262, TIKA-2402, Gh-198, Gh-196, Gh-189). - (TIKA-2262, TIKA-2355). ++ (TIKA-2262, TIKA-2355, TIKA-2402, Gh-198, Gh-196, Gh-189). * Add TestCorruptedFiles to allow devs to test parsers against corrupted input files (TIKA-2430). -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
