From dc65f0c529df22942c3c7190eec788858ac2da65 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 31 May 2013 12:30:53 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 370c235f12..059bcb04a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ phpMyAdmin - ChangeLog + [interface] Upgraded CodeMirror to 3.x series + rfe #1363 Improved query profiler +4.0.4.0 (not yet released) + 4.0.3.0 (not yet released) - bug #3941 Recent tables list always empty - bug #3933 Do not translate "Open Document" in export settings