Ciakon
114a65b46f
# Conflicts: # Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta # Assets/ML-Agents/Timers/Car Customization_timers.json.meta # Assets/Prefabs/City Pieces/building_12.prefab.meta # Assets/Prefabs/City Pieces/building_13.prefab.meta
13 lines
396 B
Plaintext
13 lines
396 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/ML-Agents/Timers/Car Customization_timers.json.meta
|
|
guid: a6b6d3fccbc8fec4fac15d627f31b6d5
|
|
TextScriptImporter:
|
|
========
|
|
guid: 6d9457d0931578f4983cff726425ccfe
|
|
PrefabImporter:
|
|
>>>>>>>> 27c2dfb90e069444ac87eeef410ee67038d22a79:Assets/Prefabs/City Pieces/building_12.prefab.meta
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|