JAL-3066 remove git conflict file
[jalview.git] / examples / biojson-doc / biojson_uml.png
examples/biojson-doc/biojson_uml.png