merge arlo
This commit is contained in:
12
Assets/RPG Monster Duo PBR Polyart.meta
Normal file
12
Assets/RPG Monster Duo PBR Polyart.meta
Normal file
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/Shumpei/GameScene.unity.meta
|
||||
guid: cd402a0773c91bd4992402447594534a
|
||||
========
|
||||
guid: 92d10f5f84c81c84084b9b952b477e74
|
||||
folderAsset: yes
|
||||
>>>>>>>> origin/slimeAI:Assets/RPG Monster Duo PBR Polyart.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user