From 360a9f4a0c3df7650dafad2199a8022935101182 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Jan 2013 07:32:45 -0500 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9bf52bbc9f..4206bdfa3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ phpMyAdmin - ChangeLog 3.5.7.0 (not yet released) - bug #3779 [core] Problem with backslash in enum fields -3.5.6.0 (not yet released) +3.5.6.0 (2013-01-28) - bug #3593604 [status] Erroneous advisor rule - bug #3596070 [status] localStorage broken in server status monitor - bug #3598736 [routines] Editing a procedure with special characters