Fix build break

2010-09-05 16:45:24 +01:00 · 2010-09-05 16:45:24 +01:00 · 09c75b30f3
parent 6a0a878f7c
commit 09c75b30f3
1 changed files with 0 additions and 4 deletions
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@ -94,11 +94,7 @@ namespace OpenSim.Framework.Servers.HttpServer

                try
                {
-<<<<<<< HEAD:OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
-                    if (resp.ContentLength > 0)
-=======
                    using (WebResponse resp = request.GetResponse())
->>>>>>> e593607... Remove "Dwell" support from core and replace it with calls to methods:OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
                    {
                        if (resp.ContentLength != 0)
                        {