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)
1  2 
src/jalview/ws/sifts/SiftsClient.java

Simple merge