Skip to content
Snippets Groups Projects
Commit 425dfdda authored by David Hoksza's avatar David Hoksza
Browse files

Merge branch 'pdb-annotation' of https://git-r3lab.uni.lu/piotr.gawron/minerva into pdb-annotation 

# Conflicts:
#	annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/PdbAnnotator.java
#	annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/PdbBestMappingEntry.java
#	annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/PdbAnnotatorTest.java
parents f209db54 dffff449
No related branches found
No related tags found
1 merge request!117Pdb annotation
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 47 deletions
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