Merge branch 'master' of git@ooftooft.net:Racesm
# Conflicts: # Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab # Assets/ML-Agents/Timers/Racetrack mini_timers.json # Assets/Scenes/Racetrack.unity # Assets/Scenes/mini_racetrack3.unity
This commit is contained in: