diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs index ab285af..b319593 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs @@ -14,14 +14,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e739b03c0a6954651887da7cf20d24c1364c96b5")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4183408f15d56f6fd691a35c6c405d4c7c28cd99")] ->>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6bf7781e333e99e88444ec8ff9a283b39cbb76f1")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// 由 MSBuild WriteCodeFragment 类生成。 +// Generated by the MSBuild WriteCodeFragment class. diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache index ce4c57e..5a07a15 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -cfae6e06243207f69a965ccfc2aa2835945fc94522a39bf6765581640615820e -======= -3b70ba9cd85eb66cf588acb2752b71b3fb9c904b9878699755da556d776d87f7 ->>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5 +28fa78caed8dce225f62f7eb24012b592ad466ecb54ec525ca75efb23582170b diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache index 0c8a31d..203a089 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache index 2cd23db..83c0234 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs index 08300ee..f8c90d4 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs @@ -14,14 +14,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -<<<<<<< HEAD -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e739b03c0a6954651887da7cf20d24c1364c96b5")] -======= -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4183408f15d56f6fd691a35c6c405d4c7c28cd99")] ->>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5 +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6bf7781e333e99e88444ec8ff9a283b39cbb76f1")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// 由 MSBuild WriteCodeFragment 类生成。 +// Generated by the MSBuild WriteCodeFragment class. diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache index a4fcb72..8d5672e 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -e772c7966a041bb27f9253949854956525802b16eb5189238c5c39a3c1a8230c -======= -6cde2dd694453a04f4ee7b27821d136ceeab0a7eba2f7234cbf29e73c7b6ac4b ->>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5 +dd09658fe56f90facd97c0311eb109b408acfee0b06e16e64d9027611fe88c86