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