methods/http.cc: remove merge artifact

diff --git a/methods/http.cc b/methods/http.cc
index 476fb75..859dbd3 100644 (file)
--- 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();
-}
-