JAL-3066 remove git conflict file
[jalview.git] / optimization / timing-java-bh-2.txt
2019-01-26 hansonrfinal timing checks for optimization