Resolve merge conflict for StructureImportSettings
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 21 Jul 2016 16:20:56 +0000 (17:20 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 21 Jul 2016 16:20:56 +0000 (17:20 +0100)
commit65c671b0263c0c692a4a0a0905a4acc2fc6b1065
treeab20f97865e3ad9f2edb8e6c6f071fecf56990c8
parent4e3166c6b7348b10af5ee6526a83eaa78191b1b6
parent82a6c8e2e25b7534168b68b2c89b9cf195f815a5
Resolve merge conflict for StructureImportSettings
src/jalview/bin/Cache.java
src/jalview/ext/jmol/JmolParser.java
src/jalview/structure/StructureImportSettings.java
test/jalview/ext/jmol/JmolParserTest.java