Ciakon
1aa075773f
# Conflicts: # 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/ML-Agents/Timers/Car Customization_timers.json # Assets/ML-Agents/Timers/City racesm_timers.json.meta # Assets/ML-Agents/Timers/Racetrack mini_timers.json # Assets/ML-Agents/Timers/WinScreen_timers.json.meta # Assets/Prefabs/Cars/Cars LLLLL.prefab.meta # Assets/Scenes/WinScreen.unity.meta
13 lines
361 B
Plaintext
13 lines
361 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/Prefabs/Cars/Cars LLLLL.prefab.meta
|
|
guid: bf357d804290737469459ec8ffeb6c7d
|
|
PrefabImporter:
|
|
========
|
|
guid: f7320b9acc0c07041a21a406416a5928
|
|
DefaultImporter:
|
|
>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/Scenes/WinScreen.unity.meta
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|