Fix merge conflict

phpmyadmin · Nov 4, 2013 · 9c0a402 · 9c0a402
1 parent b1b555b
commit 9c0a402
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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