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