From 7b819aa6d175f7a581ad6a738de3fb6505d4f072 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 14 May 2013 17:31:47 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4f37a745b7..bc86f0fbb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ values - bug #3930 Databases to choose for specific privileges show up escaped - bug #3910 Export database with empty table as a php array, does not produce valid PHP -4.0.1.0 (not yet released) +4.0.1.0 (2013-05-14) - bug #3879 Import broken for CSV using LOAD DATA - bug #3889 When login fails and error display is active, login data is displayed - bug #3890 [import] Web server upload directory import fails