From 9c0a4022d2df87d782e0c05ce1ac6e4ad5758598 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 4 Nov 2013 12:34:09 -0500 Subject: [PATCH] Fix merge conflict --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 96e10cbe8a..435c505518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ phpMyAdmin - ChangeLog 4.0.10.0 (not yet released) - bug #4150 Clicking database name in query window opens a new tab -4.0.9.0 (not yet released) +4.0.9.0 (2013-11-04) - bug #4104 Can't edit updatable view when searching - bug #4108 Missing refresh by deleting databases - bug #3995 Drizzle server charset notice