From 1cc7fe8d102358e8409f172e3ad4c2fa0928ef6d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 10 May 2013 08:02:56 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index cf8e6ef183..87d9742d04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ phpMyAdmin - ChangeLog + PMA_DBI functions in database interface libraries renamed to be compliant with PEAR standards + rfe #1412 Creating a view from an empty set of results +4.0.2.0 (not yet released) + 4.0.1.0 (not yet released) - bug #3879 Import broken for CSV using LOAD DATA - bug #3889 When login fails and error display is active, login data is displayed