This commit is contained in:
parent
a3011552e4
commit
e8a1e3dd73
Binary file not shown.
@ -19,7 +19,7 @@ namespace YD_AllHeartRates.Api
|
||||
{
|
||||
serverOptions.Limits.MaxRequestBodySize = 10485760;
|
||||
});
|
||||
webBuilder.UseKestrel().UseUrls("http://*:9996");
|
||||
webBuilder.UseKestrel().UseUrls("http://*:9994");
|
||||
webBuilder.UseIIS();
|
||||
webBuilder.UseStartup<Startup>();
|
||||
}).UseServiceProviderFactory(new AutofacServiceProviderFactory());
|
||||
|
||||
@ -14,11 +14,7 @@ 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+a3011552e4a905ce05e14a8ff0c44dca1c3ceeb3")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@ -1,5 +1 @@
|
||||
<<<<<<< HEAD
|
||||
cfae6e06243207f69a965ccfc2aa2835945fc94522a39bf6765581640615820e
|
||||
=======
|
||||
3b70ba9cd85eb66cf588acb2752b71b3fb9c904b9878699755da556d776d87f7
|
||||
>>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5
|
||||
dd7194bb40d0de10983929c8ba320cf188fe67a49331b5d9b3803231c3235c1f
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -14,11 +14,7 @@ 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+a3011552e4a905ce05e14a8ff0c44dca1c3ceeb3")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@ -1,5 +1 @@
|
||||
<<<<<<< HEAD
|
||||
e772c7966a041bb27f9253949854956525802b16eb5189238c5c39a3c1a8230c
|
||||
=======
|
||||
6cde2dd694453a04f4ee7b27821d136ceeab0a7eba2f7234cbf29e73c7b6ac4b
|
||||
>>>>>>> e739b03c0a6954651887da7cf20d24c1364c96b5
|
||||
9449a9877321fe5de1ea0a820503de509581ed5d7e64230fef9c2bbcf92c1a53
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user