JAL-3066 remove git conflict file
[jalview.git] / resources / images / logo_big.gif
resources/images/logo_big.gif