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