diff options
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 0 insertions, 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" /***************************************************************************** |