From 0730b24d7cb0a0ce0d6d08bc4e98387124bf03d0 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Tue, 26 Jun 2012 22:27:24 -0600
Subject: fix merge conflicts: v-r to drano

---
 indra/llmessage/llcurl.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'indra/llmessage')

diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 1b0f9437c9..b4ac984d57 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -990,18 +990,8 @@ void LLCurlThread::killMulti(LLCurl::Multi* multi)
 		return ;
 	}
 
-<<<<<<< local
-	if(multi->isValid())
-	{
-		multi->markDead() ;
-	}
-	else
-	{
-		deleteMulti(multi) ;
-	}
-=======
+
 	multi->markDead() ;
->>>>>>> other
 }
 
 //private
-- 
cgit v1.2.3