resolve merge conflict in SiftsClientTest
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:05:45 +0000 (15:05 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 14:05:45 +0000 (15:05 +0100)
commit76c686b12f3626883b6d4326c29955011ac211fa
tree23e20a5aa792bd81e18fa8f3bee193f328640329
parent207b06de28859536277608ad94897eaa526b1279
resolve merge conflict in SiftsClientTest
test/jalview/ws/sifts/SiftsClientTest.java