fix conflicts during merge of Arun's tree
[phpfspot.git] / resources / image.png
resources/image.png