JAL-2754 corrected merge conflict
[jalview.git] / schemas / sifts /
2015-10-13 tcofoegbuJAL-1479 added SIFTS XSD and generated JAXB bindings...