Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2015-04-14 13:29:23 -04:00
commit bc76252f26

View File

@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
4.4.3.0 (not yet released)
- bug #4851 PHP errors in login dialogue
- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version
- bug #4845 White screen (Cloudflare)
4.4.2.0 (2015-04-13)
- bug #4835 PMA_hideShowConnection not called after submit_num_fields