JAL-3066 remove git conflict file
[jalview.git] / RELEASE
1 jalview.release=releases/Release_2_12_Branch
2 jalview.version=2.12.0-alpha