fix version

OoTRandomizer · Nov 11, 2023 · 0afb82d · 0afb82d
1 parent 91dbd53
commit 0afb82d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/version.py b/version.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 __version__ = '8.0.0'
-=======
-__version__ = '7.1.210'
->>>>>>> Dev
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 1