diff options
| author | Alexander Ivanov <alexi1952@yandex.ru> | 2009-10-17 10:12:57 +0400 |
|---|---|---|
| committer | Alexander Ivanov <alexi1952@yandex.ru> | 2009-10-17 10:12:57 +0400 |
| commit | 3ea974ad2ff861ed20bc196d5da18ae5cbebe073 (patch) | |
| tree | 2d386a93d41cda8b90f3be1020b6338523c5b706 /sql/sql_string.cc | |
| parent | f7526c063ee4875d0b724cfa600921edf13425cf (diff) | |
| download | mariadb-git-3ea974ad2ff861ed20bc196d5da18ae5cbebe073.tar.gz | |
After merge
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" /***************************************************************************** |