1
This commit is contained in:
12
Assets/Art/Main/Addressableres.meta
Normal file
12
Assets/Art/Main/Addressableres.meta
Normal file
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Art/Main/Addressableres.meta
|
||||
guid: ac6799020d8624d4a9d641fa20f489b2
|
||||
========
|
||||
guid: c8b5b1170c6dda7479249930569dd626
|
||||
>>>>>>>> origin/art:Assets/Art/Main/SpecialEffects.meta
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user