JAL-2774 Fixed merge issues
[jalview.git] / examples / images / logo.jpg
examples/images/logo.jpg