fix merge

This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
960 changed files with 23754 additions and 23741 deletions

View File

@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public bool KeepAlive
{
get
get
{
return _httpResponse.Connection == ConnectionType.KeepAlive;
}