resolved merge conflict
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:16:24 +0000 (15:16 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:16:24 +0000 (15:16 +0100)
commit8feb5f87bd94e5d49c9dbc5fd7ec7e866ef80e9d
tree958673b036ba8fad14bea2635561b6bff35f1076
parent19b5db52eb1285a22f8225f4baa914c2d7b15edd
parent76c686b12f3626883b6d4326c29955011ac211fa
resolved merge conflict
src/jalview/ws/sifts/SiftsClient.java