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