After merge

3ea974ad · Alexander Ivanov · f7526c06 · 3ea974ad
Commit 3ea974ad authored Oct 17, 2009 by Alexander Ivanov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

sql/sql_string.cc sql/sql_string.cc +0 -4

No files found.
--- 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"

 /*****************************************************************************