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