3.23.1

EndangeredNayla · Aug 25, 2024 · bf7439b · bf7439b
2 parents 767cb05 + b5de1aa
commit bf7439b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/codes/marioParty7.py b/codes/marioParty7.py
@@ -401,5 +401,10 @@ def initialCoinsMod7(hex, hexDec):
     return f'''
 MP7 - Gain {hexDec} Coins at the Start of the Game
 02196D12 0000{hex}
+<<<<<<< HEAD
 02151DEA 0000{hex}
-'''
+'''
+=======
+02151DEB 0000{hex}
+'''
+>>>>>>> b5de1aa02ec72ef5e18bebec4176e73cbb01f859
diff --git a/version.py b/version.py
@@ -5,4 +5,4 @@
 # License: MIT
 # ============================================
 
-versionString = "3.23"
+versionString = "3.23.1"