fixup

diff --git a/socket.c b/socket.c
index 5039ac5ff8cdc974c9e1c7a9ae8a86bffdd1e50e..c2915b6c8ceab69753d1f35efc89fc7b4cfbca76 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -340,11 +340,6 @@ int SockOpen(const char *host, const char *service,
     return i;
 }
 
-<<<<<<< HEAD
-#if defined(HAVE_STDARG_H)
-=======
-
->>>>>>> before-cpp
 int SockPrintf(int sock, const char* format, ...)
 {
     va_list ap;