张铮
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
13 lines
342 B
Plaintext
13 lines
342 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Base.meta
|
|
guid: f458924b47972e344ab95e73c17cec83
|
|
========
|
|
guid: f18d57a48c234514eaf0997407d2c9dd
|
|
>>>>>>>> 04.AudioCore:Assets/04.AudioCore/RunTime/Base.meta
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|