JAL-3066 remove git conflict file
[jalview.git] / test / junit /
drwxr-xr-x   ..
drwxr-xr-x - extensions