1 files changed, 0 insertions, 4 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
index 0135a6c..41ece86 100644
--- 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)
                         {