diff options
Diffstat (limited to 'mysys/mysys_priv.h')
| -rw-r--r-- | mysys/mysys_priv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 30ffac0ac77..772e0346016 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -85,7 +85,6 @@ extern PSI_file_key key_file_charset, key_file_cnf; #endif void my_error_unregister_all(void); -<<<<<<< TREE #ifdef _WIN32 #include <sys/stat.h> |