Merge branch 'develop' into codegenerator

2026-04-27 22:58:03 +02:00
1 changed files with 0 additions and 3 deletions
@@ -39,14 +39,11 @@ globals = {
  "MysteriousManScreen",
  "DiscussionWindow",
  "EndWindow",
-<<<<<<< HEAD
  "PlayerNameWindow",
  "TextInput",
  "CodeGenerator",
  "CreditsWindow",
-=======
  "GameOverWindow",
->>>>>>> develop
  "mset",
  "mget",
  "btnp",