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