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