resolve conflict with Mungo's merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 22 Mar 2016 17:02:10 +0000 (17:02 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 22 Mar 2016 17:02:10 +0000 (17:02 +0000)
commit9fe87bd08ab29b6fe53364f387d7a2e3a8d39994
tree4d0a00ef225eb7a0a3f9550175fa3e21bc6cec1a
parent86e1bfc3ed99bee91069b3238eb291c3955338d3
parent91b4e1f8e16b51f601c74b4da3691f1f5d433211
resolve conflict with Mungo's merge
src/jalview/ws/dbsources/EmblXmlSource.java
src/jalview/ws/ebi/EBIFetchClient.java