JAL-3066 remove git conflict file
[jalview.git] / resources / images / warning.gif
2015-05-28 tcofoegbuJAL-1700 made PDB service error mechanism more user...