git conflict resolution
[jalview.git] / resources /
2005-02-23 jprocternew resources location.