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