Merge branch '05.TableTextConversion' into master1
# Conflicts: # .gitlab-ci.yml
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2431e4790e09c474fa97846168ce9b7f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d68ee2e51faf9a949814bbfcb7318f55
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user