fixed merge conflicts
[henge/kiak.git] / www / ms-icon-70x70.png
www/ms-icon-70x70.png Reading blob failed.