mirror of
https://github.com/MariaDB/server.git
synced 2026-04-30 12:15:32 +02:00
After merge
This commit is contained in:
parent
f7526c063e
commit
3ea974ad2f
1 changed files with 0 additions and 4 deletions
|
|
@ -26,10 +26,6 @@
|
|||
#ifdef HAVE_FCONVERT
|
||||
#include <floatingpoint.h>
|
||||
#endif
|
||||
<<<<<<< TREE
|
||||
=======
|
||||
|
||||
>>>>>>> MERGE-SOURCE
|
||||
#include "sql_string.h"
|
||||
|
||||
/*****************************************************************************
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue