Resolving some conflicts in the shortcuts.
[surf.git] / surf.png
surf.png