JAL-3066 remove git conflict file
[jalview.git] / LICENSE
2010-04-30 jprocterjalview 2.5 release banner
2005-06-08 amwaterhouseGPL