Commit 92b93dbb authored by Javi Corvi's avatar Javi Corvi
Browse files

Merge branch 'develop' of

https://gitlab.bsc.es/inb/etransafe/pretox-relation-extraction.git into
develop

Conflicts:
	src/main/java/es/bsc/inb/ades/relation/extraction/main/App.java
parents f5e4f086 faaf2b28
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment