Author: rwesten
Date: Tue Feb 23 09:17:59 2016
New Revision: 1731813
URL: http://svn.apache.org/viewvc?rev=1731813&view=rev
Log:
merged fix for STANBOL-1449 to trunk
Added:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/TestDefaults.java
- copied unchanged from r1731812,
stanbol/branches/release-0.12/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/TestDefaults.java
Modified:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/ (props changed)
Propchange: stanbol/trunk/enhancement-engines/dbpedia-spotlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 23 09:17:59 2016
@@ -2,7 +2,7 @@
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight:1386989-1388016
/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight:1339554,1339557-1339558
/stanbol/branches/STANBOL-913/dbpedia-spotlight:1443935-1448276
-/stanbol/branches/release-0.12/enhancement-engines/dbpedia-spotlight:1731810
+/stanbol/branches/release-0.12/enhancement-engines/dbpedia-spotlight:1731810,1731812
/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancement-engines/dbpedia-spotlight:1455112-1458685
/stanbol/trunk/enhancement-engines/dbpedia-spotlight:1496360-1533530
