JAL-2679 reinstating changes lost in VCF merge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 14 Mar 2018 14:41:14 +0000 (14:41 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 14 Mar 2018 16:33:42 +0000 (16:33 +0000)
commit81aed8efd699ef862b29dc638605f23b49ad98d3
tree9b096b661114c99209e5abb972228d6444a03d2b
parent640f0df12197d5f013b89ec6dc6b41ee18ba77b6
JAL-2679 reinstating changes lost in VCF merge

Conflicts:
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblLookup.java