Merge branch 'features/JAL-3375vcfValidation' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jul 2019 18:42:30 +0000 (20:42 +0200)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jul 2019 18:42:30 +0000 (20:42 +0200)
commit25da4ccb5679905ada8b21e4d21fd416c392ab76
tree1870c75700dd6af6769d18b488827c4243e9b8d8
parent94fe1bfb6ca65c8a787a336ebffde44df6795803
parent91d83d4836ba3f8c6c395d46d607faf693946e66
Merge branch 'features/JAL-3375vcfValidation' into
feature/JAL-3187linkedFeatures

Conflicts:
src/jalview/io/vcf/VCFLoader.java
test/jalview/io/vcf/VCFLoaderTest.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/vcf/VCFLoader.java
test/jalview/io/vcf/VCFLoaderTest.java