1
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Art/Main/SpecialEffects/Hovl Studio/Procedural fire/Prefabs.meta
|
||||
guid: 6a69c24f54926f14cbc357dd8ae715a2
|
||||
========
|
||||
guid: 859fb35238c791b46adc1f32f5c5b168
|
||||
>>>>>>>> origin/art:Assets/Art/Main/SpecialEffects/Hovl Studio/Procedural fire/Shaders.meta
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user