From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 30 Jul 2009 16:25:16 +0000 (+0200)
Subject: methods/http.cc: remove merge artifact
X-Git-Tag: 0.7.24ubuntu1~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/056539eeb8eb84cea65c0c15466111b978ee156d

methods/http.cc: remove merge artifact
---

diff --git a/methods/http.cc b/methods/http.cc
index 476fb751f..859dbd39c 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1316,15 +1316,4 @@ int HttpMethod::Loop()
 }
 									/*}}}*/
 
-int main()
-{
-   setlocale(LC_ALL, "");
-   // ignore SIGPIPE, this can happen on write() if the socket
-   // closes the connection (this is dealt with via ServerDie())
-   signal(SIGPIPE, SIG_IGN);
-
-   HttpMethod Mth;
-   return Mth.Loop();
-}
-