Resolved merge conflict in EdtiCommandTest.java
[jalview.git] / test / jalview / bin /
drwxr-xr-x   ..
-rw-r--r-- 10031 CommandLineOperations.java