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/Images/Car Icons.meta
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta
#	Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
#	Assets/ML-Agents/Timers/SampleScene_timers.json.meta
This commit is contained in:
PokingPines
2024-04-23 08:26:25 +02:00
parent 6e9746bd84 e3c6bd1fd6
commit efbffea201
68 changed files with 12437 additions and 1706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,17 @@
fileFormatVersion: 2
<<<<<<< HEAD
<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
guid: 4af2646cae3014146bf467e2830fdb41
TextScriptImporter:
=======
guid: 27000db5eaa3d9f42bceff430c265d3a
folderAsset: yes
DefaultImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
=======
guid: 346e9f2550a219244aeff3bf857e8b41
TextScriptImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
externalObjects: {}
userData:
assetBundleName: