JAL-3066 remove git conflict file
[jalview.git] / unused / javajs /
2019-01-31 hansonrremoves org.json from srcjar