diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysys/mysys_priv.h | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
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> |