JAL-2690attemptedmerge seems to work
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml