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