From 09c75b30f361cbcdd0123f0e65b24f031a9bdeae Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Sep 2010 16:45:24 +0100
Subject: Fix build break

---
 OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs')

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)
                         {
-- 
cgit v1.1