From 773c5312d99ae761708fd2b24c652029a9d0f39a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 5 Jun 2013 06:42:57 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 90b2b4ad0c..52a087075e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ phpMyAdmin - ChangeLog - bug #3897 Row Statistics and Space usage bugs - bug #3966 Only display "table has no unique column" message when applicable -4.0.3.0 (not yet released) +4.0.3.0 (2013-06-05) - bug #3941 Recent tables list always empty - bug #3933 Do not translate "Open Document" in export settings - bug #3927 List of tables is missing after expanding in the navigation frame