Fix merge conflict

This commit is contained in:
Marc Delisle 2013-05-14 17:31:47 -04:00
parent 84d7995680
commit 7b819aa6d1

View File

@ -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