Files
racesm/Assets/Images/Car Icons.meta
PokingPines efbffea201 Merge branch 'master' of git@ooftooft.net:Racesm.git
# 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
2024-04-23 08:26:25 +02:00

13 lines
407 B
Plaintext

fileFormatVersion: 2
<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
guid: d884527f3e242c144af52b11faf49d2f
=======
guid: d5d570160164b804ca24a36b21a621db
folderAsset: yes
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: