Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into upstream-merge
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Dockerfile.crf
#	build.gradle
#	grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java
  • Loading branch information
@salceson
salceson committed Nov 22, 2024
2 parents a37a5a1 + 354132f commit ecc4a1e

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.

0 comments on commit ecc4a1e

Please sign in to comment.