Resolved merge conflict in EdtiCommandTest.java
[jalview.git] / test / jalview / commands /
drwxr-xr-x   ..
-rw-r--r-- 20890 EditCommandTest.java