Resolve merge conflict for StructureImportSettings
[jalview.git] / test / jalview / ws / ebi /
drwxr-xr-x   ..
-rw-r--r-- 3017 EBIFetchClientTest.java