Skip to content

M
mariadb
Commit 3ea974ad authored by Alexander Ivanov's avatar Alexander Ivanov
Browse files
Options

After merge

parent f7526c06
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
sql/sql_string.cc
View file @ 3ea974ad
...@@ -26,10 +26,6 @@ ...@@ -26,10 +26,6 @@
#ifdef HAVE_FCONVERT #ifdef HAVE_FCONVERT
#include <floatingpoint.h> #include <floatingpoint.h>
#endif #endif
<<<<<<< TREE
=======
>>>>>>> MERGE-SOURCE
#include "sql_string.h" #include "sql_string.h"
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7