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 2020/07/17 17:47:09 UTC
[tika] 06/06: fix merge conflicts
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit d2aa1ac2613e1ac6b7ed0d5abb7db5d8650a275c
Author: tallison <ta...@apache.org>
AuthorDate: Fri Jul 17 13:46:44 2020 -0400
fix merge conflicts
---
.../main/java/org/apache/tika/eval/metadata/TikaEvalMetadataFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/metadata/TikaEvalMetadataFilter.java b/tika-eval/src/main/java/org/apache/tika/eval/metadata/TikaEvalMetadataFilter.java
index 2c69801..b33b041 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/metadata/TikaEvalMetadataFilter.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/metadata/TikaEvalMetadataFilter.java
@@ -38,7 +38,7 @@ import java.util.Map;
public class TikaEvalMetadataFilter implements MetadataFilter {
- public static String TIKA_EVAL_NS = "tika-eval"+ TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER;
+ public static String TIKA_EVAL_NS = "tika-eval" + Metadata.NAMESPACE_PREFIX_DELIMITER;
public static Property NUM_TOKENS = Property.externalInteger(TIKA_EVAL_NS+"numTokens");