From e66c666e64a47966953d18ed57747e6737e07332 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Wed, 12 Oct 2011 22:56:01 +0300
Subject: [PATCH] removed unwanted first line

---
 library/http_connection_handler.e | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/http_connection_handler.e b/library/http_connection_handler.e
index 2c024604..d23f178e 100644
--- a/library/http_connection_handler.e
+++ b/library/http_connection_handler.e
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 note
 	description: "Summary description for {HTTP_CONNECTION_HANDLER}."
 	author: ""