Resolve merge conflict for StructureImportSettings
[jalview.git] / src / jalview / ext / jmol /
drwxr-xr-x   ..
-rw-r--r-- 41056 JalviewJmolBinding.java
-rw-r--r-- 5678 JmolCommands.java
-rw-r--r-- 16044 JmolParser.java