From 3ea974ad2ff861ed20bc196d5da18ae5cbebe073 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexi1952@yandex.ru>
Date: Sat, 17 Oct 2009 10:12:57 +0400
Subject: [PATCH] After merge

---
 sql/sql_string.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 601343a73ce..a326e8a7ef0 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -26,10 +26,6 @@
 #ifdef HAVE_FCONVERT
 #include <floatingpoint.h>
 #endif
-<<<<<<< TREE
-=======
-
->>>>>>> MERGE-SOURCE
 #include "sql_string.h"
 
 /*****************************************************************************