This commit is contained in:
tanglong 2026-03-10 10:29:16 +08:00
commit 6bf7781e33
4 changed files with 16 additions and 0 deletions

View File

@ -14,7 +14,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e739b03c0a6954651887da7cf20d24c1364c96b5")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e739b03c0a6954651887da7cf20d24c1364c96b5")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4183408f15d56f6fd691a35c6c405d4c7c28cd99")]
>>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5
[assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1,5 @@
<<<<<<< HEAD
cfae6e06243207f69a965ccfc2aa2835945fc94522a39bf6765581640615820e cfae6e06243207f69a965ccfc2aa2835945fc94522a39bf6765581640615820e
=======
3b70ba9cd85eb66cf588acb2752b71b3fb9c904b9878699755da556d776d87f7
>>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5

View File

@ -14,7 +14,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Commons")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e739b03c0a6954651887da7cf20d24c1364c96b5")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e739b03c0a6954651887da7cf20d24c1364c96b5")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4183408f15d56f6fd691a35c6c405d4c7c28cd99")]
>>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5
[assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1,5 @@
<<<<<<< HEAD
e772c7966a041bb27f9253949854956525802b16eb5189238c5c39a3c1a8230c e772c7966a041bb27f9253949854956525802b16eb5189238c5c39a3c1a8230c
=======
6cde2dd694453a04f4ee7b27821d136ceeab0a7eba2f7234cbf29e73c7b6ac4b
>>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5