From 4ac7e466053422ae48b328b6be2aa9a17812d1dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 11 Mar 2010 14:00:01 +0100 Subject: [PATCH] Forgotten conflict resolving after merge. --- ChangeLog | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58e312226f..f120b5a1a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,11 +97,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin -<<<<<<< HEAD - [privileges] Improve escaping of hostname -======= -- [privileges] Improve Proper escaping of hostname ->>>>>>> origin/MAINT_3_3_0 3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status -- 2.11.4.GIT