This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tika.git
commit 2f6c7aface25ba8f8853ac8fbc8c5280f6e76600 Author: TALLISON <[email protected]> AuthorDate: Fri Sep 14 12:23:56 2018 -0400 fix conflict --- tika-dl/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml index 62c03b6..4888811 100644 --- a/tika-dl/pom.xml +++ b/tika-dl/pom.xml @@ -281,6 +281,10 @@ <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency>
