removed unwanted first line

2011-10-12 22:56:01 +03:00
parent 4cd1b67607
commit e66c666e64
1 changed files with 0 additions and 1 deletions
--- 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: ""