Revision 2a7952de29a58a8df75de32e19a70c5126f330fa authored by Luca Foppiano on 20 September 2017, 20:49:17 UTC, committed by Luca Foppiano on 20 September 2017, 21:06:47 UTC
# Conflicts:
#	doc/Grobid-batch.md
#	doc/training/fulltext.md
#	grobid-core/pom.xml
#	grobid-core/src/main/resources/log4j.xml
#	grobid-core/src/test/java/org/grobid/core/engines/EngineTest.java
#	grobid-core/src/test/java/org/grobid/core/lexicon/FastMatcherTest.java
#	grobid-core/src/test/java/org/grobid/core/lexicon/LexiconIntegrationTest.java
#	grobid-service/src/main/java/org/grobid/service/GrobidRestService.java
#	grobid-service/src/main/java/org/grobid/service/process/GrobidRestProcessFiles.java
#	grobid-service/src/main/java/org/grobid/service/process/GrobidRestProcessGeneric.java
#	grobid-service/src/main/java/org/grobid/service/process/GrobidRestProcessString.java
#	grobid-service/src/main/resources/log4j-jetty.properties
#	grobid-trainer/src/main/java/org/grobid/trainer/NameCitationTrainer.java
#	pom.xml


Former-commit-id: e594e2e527be09a19ef0ac069e21b83d43c5161e
2 parent s 42f2006 + 14f3d45
History
File Mode Size
bin
doc
grobid-core
grobid-home
grobid-service
grobid-trainer
lib
.editorconfig -rw-r--r-- 357 bytes
.gitattributes -rw-r--r-- 32 bytes
.gitignore -rw-r--r-- 1.2 KB
.travis.yml -rw-r--r-- 345 bytes
Dockerfile -rw-r--r-- 1.6 KB
LICENSE -rwxr-xr-x 20.2 KB
Readme.md -rw-r--r-- 8.2 KB
build.xml -rw-r--r-- 1.8 KB
maven-build.xml -rw-r--r-- 4.6 KB
mkdocs.yml -rw-r--r-- 1.6 KB
pom.xml -rwxr-xr-x 11.3 KB

Readme.md

back to top