fix all merge conflicts

unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this
This commit is contained in:
minenice55
2022-08-09 11:23:17 -04:00
parent 6ac37d51d4
commit e8975c6dc4
32 changed files with 62 additions and 6938 deletions

View File

@ -16,12 +16,4 @@ namespace HeavenStudio.Games.Scripts_TramAndPauline
}
}
}
}