Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta
#	Assets/ML-Agents/Timers/WinScreen_timers.json
This commit is contained in:
Ciakon
2024-04-26 10:25:49 +02:00
parent 3b9ef2ad1b f4d4e76f8b
commit 2296b85dc5
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/ML-Agents/Timers/ForestRacetrack_timers.json.meta
View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: d8bb5515cee0b6a4eb5b45eb46ece700
=======
guid: 6988adb36b3693a46b16dc30340e98ca
>>>>>>> f4d4e76f8b5ccb20237103e437b5acd47d7b3c40
TextScriptImporter:
externalObjects: {}
userData: