JAL-3066 remove git conflict file
[jalview.git] / examples / images /
2012-11-07 jprocterJAL-1201 update pages to use new website design