JAL-3066 remove git conflict file
[jalview.git] / examples / images / logo.jpg
examples/images/logo.jpg