mirror of
https://github.com/gooba42/adventureland.git
synced 2026-10-15 02:39:29 -05:00
Conflict fix
This commit is contained in:
@@ -114,11 +114,7 @@ if is_production:
|
||||
#maps["desertland"]["key"]="jayson_desertland_copy"
|
||||
pass
|
||||
|
||||
<<<<<<< HEAD
|
||||
game_version=825
|
||||
=======
|
||||
game_version=827
|
||||
>>>>>>> 01a2112 (Pre pull)
|
||||
SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales
|
||||
update_notes=[
|
||||
"Last Update [August 7th]",
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user