Merge branch '04.AudioCore' into master1
# 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
This commit is contained in:
12
Assets/04.AudioCore/RunTime/Abstract.meta
Normal file
12
Assets/04.AudioCore/RunTime/Abstract.meta
Normal file
@@ -0,0 +1,12 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Abstract.meta
|
||||
guid: 3f4958b2707b1874fb59e045842881b7
|
||||
========
|
||||
guid: b4cff2e957a4add41a649e570dbabd9d
|
||||
>>>>>>>> 04.AudioCore:Assets/04.AudioCore/RunTime/Abstract.meta
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user