From: Skullheadx <704277@pdsb.net>
Date: Wed, 6 Jul 2022 16:36:26 +0000 (-0400)
Subject: Update game_doc.txt
X-Git-Url: http://git.skullheadx.com/pfp.webp?a=commitdiff_plain;h=1aa96c6f5785eb5af6627e106cd54d642da3bb4e;p=Pygame-Jam.git

Update game_doc.txt
---

1aa96c6f5785eb5af6627e106cd54d642da3bb4e
diff --cc game_doc.txt
index 8d38e07,9522474..c30bf2e
--- a/game_doc.txt
+++ b/game_doc.txt
@@@ -9,7 -9,7 +9,11 @@@ List of Dimensions
  
  Gameplay:
  - dialogue between npcs
++<<<<<<< HEAD
 +- combat, exploration
++=======
+ - combat, exploration with parkour or platforming
++>>>>>>> 37f90fc3e905b6de9f3dc742a368383efeffe158
  
  story
  - stars fall out of the sky and other people collected them including the player