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