conflict resolved
This commit is contained in:
8
Assets/bramboracolor1.mat.meta
Normal file
8
Assets/bramboracolor1.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5cdeb522c6080cd4ab44003c3b1ffdd4
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user