conflict resolved
This commit is contained in:
16
Assets/Materials.meta
Normal file
16
Assets/Materials.meta
Normal file
@@ -0,0 +1,16 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 6cf6ace151aa0204c9a7cb5e00164105
|
||||
=======
|
||||
guid: 6b37670de43269e4f984694475e75510
|
||||
>>>>>>> origin/main
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
<<<<<<< HEAD
|
||||
assetBundleVariant:
|
||||
=======
|
||||
assetBundleVariant:
|
||||
>>>>>>> origin/main
|
||||
Reference in New Issue
Block a user