d022a0eb67
Conflicts: common/dist/sprites/habitrpg-shared.css common/dist/sprites/spritesmith0.png common/dist/sprites/spritesmith2.png common/dist/sprites/spritesmith3.css common/dist/sprites/spritesmith3.png common/dist/sprites/spritesmith4.css common/dist/sprites/spritesmith4.png
We need to extract any sprite-sheet css in this directory (anything that's not habitrpg-web specific) and move it to common