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

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

Browse Source 
# Conflicts:
#	Assets/ML-Agents/Timers/SampleScene_timers.json.meta
This commit is contained in:
PokingPines
2024-04-23 08:27:07 +02:00
parent efbffea201 9f8c2c1d81
commit ae9838c02e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta <<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
guid: 4af2646cae3014146bf467e2830fdb41 guid: 4af2646cae3014146bf467e2830fdb41
TextScriptImporter: TextScriptImporter:
@@ -10,6 +11,9 @@ DefaultImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta >>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
======= =======
guid: 346e9f2550a219244aeff3bf857e8b41 guid: 346e9f2550a219244aeff3bf857e8b41
=======
guid: 4d57ab7f0c619e9439665e6de75b5d44
>>>>>>> 9f8c2c1d8177a6b47862a1b23538206e355848a2
TextScriptImporter: TextScriptImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92 >>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
externalObjects: {} externalObjects: {}