JAL-2788 corrected merge error in propertyChange
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml