From 2ff7b4cc93eb88325b2ac2930b966208642c1111 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 3 Oct 2011 12:42:35 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 016cbaf353..924868936b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,8 @@ phpMyAdmin - ChangeLog + Support Drizzle database - bug #3356456 [interface] Interface problems for queries having LIMIT clauses +3.4.7.0 (not yet released) + 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error