JAL-3066 remove git conflict file
[jalview.git] / srcjar / fr /
drwxr-xr-x   ..
drwxr-xr-x - orsay