2ceb18470b
# Conflicts: # Assets/Imported Assets/Kevin Iglesias.meta # Assets/Imported Assets/Kevin Iglesias/Basic Motions/Animations/Idles.meta # Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta # Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
14 lines
401 B
Plaintext
14 lines
401 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD:Assets/Imported Assets/Kevin Iglesias.meta
|
|
guid: 3fbd4e731b87fd4469babb69c4af0ba9
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
=======
|
|
guid: 148686e89d63c1543b7c4ebf056f7fd0
|
|
TextScriptImporter:
|
|
>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|