[tika] branch main updated: Fix bad merge-conflict fix

[ta...@apache.org]

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


The following commit(s) were added to refs/heads/main by this push:
     new c4396cd  Fix bad merge-conflict fix
c4396cd is described below

commit c4396cd959f44ba549a8389750d58c452a8db669
Author: tallison <ta...@apache.org>
AuthorDate: Fri Aug 21 13:08:58 2020 -0400

    Fix bad merge-conflict fix
---
 tika-parsers/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 9c9015b..6361b9e 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -30,10 +30,10 @@
   </parent>
 
   <artifactId>tika-parsers</artifactId>
-  <packaging>bundle</packaging>
   <name>Apache Tika parsers</name>
   <url>http://tika.apache.org/</url>
 
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>