JAL-3066 remove git conflict file
[jalview.git] / resources / images / jetset_jalview_splash.png
resources/images/jetset_jalview_splash.png