张铮
3fb3e9d758
# Conflicts: # .gitlab-ci.yml # Assets/01.CodeChecker/Editor.meta # Assets/01.CodeChecker/Editor/UnityRoslyn.meta # Assets/02.InformationSave/RunTime/Abstract.meta # Assets/02.InformationSave/RunTime/Base.meta # Assets/04.AudioCore/RunTime/Abstract.meta # Assets/04.AudioCore/RunTime/AudioCore.RunTime.asmdef.meta # Assets/04.AudioCore/RunTime/Base.meta # Assets/04.AudioCore/RunTime/Use.meta # Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs.meta # Assets/05.TableTextConversion/Editor/EditorFrameworkUtils.cs.meta # Assets/05.TableTextConversion/Editor/Excel.meta # Assets/05.TableTextConversion/README.md # Assets/05.TableTextConversion/RunTime/Abstract.meta # Assets/05.TableTextConversion/RunTime/Base.meta # Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs.meta # Assets/05.TableTextConversion/RunTime/Test.cs.meta # Assets/05.TableTextConversion/RunTime/Use.meta # Assets/05.TableTextConversion/package.json # Assets/Plugins.meta
14 lines
390 B
Plaintext
14 lines
390 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/05.TableTextConversion/Editor/Excel.meta
|
|
guid: 4f1217f9aa6674740afe51db32d6d46f
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
========
|
|
guid: 44e8639d57fc2a94b94ecef44bf1e36a
|
|
AssemblyDefinitionImporter:
|
|
>>>>>>>> 04.AudioCore:Assets/04.AudioCore/RunTime/AudioCore.RunTime.asmdef.meta
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|