Merge branch 'master' of git@ooftooft.net:Racesm.git

# Conflicts:
#	Assets/Scenes/City racesm.unity
This commit is contained in:
magn9775
2024-04-19 13:46:20 +02:00

View File

@@ -2066,8 +2066,11 @@ SceneRoots:
- {fileID: 1354571877}
- {fileID: 1156124445}
- {fileID: 1100668831}
- {fileID: 1445263863}
- {fileID: 1341391224}
- {fileID: 1400436482}
- {fileID: 1693798329}
- {fileID: 1382664130}
- {fileID: 935745055}
- {fileID: 4396875973761687100}
- {fileID: 79477803}