fix conflicts during merge of Arun's tree

[phpfspot.git] / resources / zoom-in.png

diff --git a/resources/zoom-in.png b/resources/zoom-in.png
index b63f0e54fdde4bd7d394414fedecda22c2f3fc48..ea7e42ff68feb8f07c42c1935e45a6bdea0c32e6 100644 (file)
Binary files a/resources/zoom-in.png and b/resources/zoom-in.png differ