resolve merge conflict in SiftsClientTest
[jalview.git] / utils / jhindexer
2005-02-23 jprocterrearranged project structure