JAL-653 JAL-1766 merge 290b1 - fix erroneous conflicts on test asserts
[jalview.git] / .settings /
drwxr-xr-x   ..
-rw-r--r-- 24444 org.eclipse.jdt.core.prefs
-rw-r--r-- 3160 org.eclipse.jdt.ui.prefs