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
12 lines
374 B
Plaintext
12 lines
374 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/ML-Agents/Timers/City racesm_timers.json.meta
|
|
guid: ca66b14272dc63548acbee53df329532
|
|
========
|
|
guid: b02eb4a9869b93e4d9092991c9f89a8f
|
|
>>>>>>>> 3f8f7e0a3765a7af3156232c0fa677c9758ce5d8:Assets/ML-Agents/Timers/WinScreen_timers.json.meta
|
|
TextScriptImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|