Fixed merge conflict

2014-08-31 01:39:09 +02:00 · 2014-08-31 01:39:09 +02:00 · f98940e307
parent f11f6f3c2e f3f94ae861
commit f98940e307
1 changed files with 1 additions and 0 deletions
--- a/game.py
+++ b/game.py
@ -203,6 +203,7 @@ class TheGame:
                # Had enough of this?
                if event.type == pygame.QUIT:
                    running = False
                    game.gameOver()
                    pygame.quit()
                    sys.exit()