merge arlo
This commit is contained in:
13
Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
Normal file
13
Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
Normal file
@@ -0,0 +1,13 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/RECURSOS YOS UNITY.meta
|
||||
guid: 28785ec045ec00946ab767b14c8f4c6d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
========
|
||||
guid: 288eb0a3190dc75419059ff7b4b70aa0
|
||||
PrefabImporter:
|
||||
>>>>>>>> origin/slimeAI:Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user