From 3be983213d997ababee5d2e5f606e41b07d8f725 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 21 Mar 2011 00:46:01 +0100
Subject: [PATCH] oeps2

---
 Connector_HTTP/main.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Connector_HTTP/main.cpp b/Connector_HTTP/main.cpp
index 6b862aab..f2a7acb3 100644
--- a/Connector_HTTP/main.cpp
+++ b/Connector_HTTP/main.cpp
@@ -298,18 +298,7 @@ int mainHandler(int CONN_fd){
                   if (FlashBuf != ""){
                     Flash_FragBuffer.push(FlashBuf);
                     #if DEBUG >= 4
-<<<<<<< HEAD
                     fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
-=======
-        time_t rawtime;
-        struct tm * timeinfo;
-        char timebuffer [80];
-        time ( &rawtime );
-        timeinfo = localtime ( &rawtime );
-        strftime (timebuffer,80,"%H:%M.%S.",timeinfo);
-        fprintf(stderr, "< %s >\t", timebuffer );
-		    fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
->>>>>>> 7520f5799f3da3c1a89a28fd4d62358b0028d8d2
                     #endif
                   }
                   FlashBuf.clear();