fixed merge conflicts
[henge/kiak.git] / www / favicon-32x32.png
www/favicon-32x32.png Reading blob failed.