fix merge conflicts for finess on JAL-1140 (introduced by 1a8f953dd71a9e319e910261927...
[jalview.git] / src /
drwxr-xr-x   ..
drwxr-xr-x - MCview
-rw-r--r-- 10147 castor.properties
drwxr-xr-x - com
drwxr-xr-x - ext
drwxr-xr-x - jalview
drwxr-xr-x - org
drwxr-xr-x - uk
drwxr-xr-x - vamsas