From 8d1be739b0053424ebd7563eb6bc7eb4aace6bba Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 8 Dec 2013 06:27:25 -0500 Subject: [PATCH] Fix merge conflict Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6781477e7b..663301920f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ phpMyAdmin - ChangeLog - bug #4157 Changing users password will delete it + rfe #1474 Text transformation combines Append and Prepend +4.1.1.0 (not yet released) + 4.1.0.0 (not yet released) + rfe #499 On user creation, warn if the user already exists + Use indeterminate check all checkbox in server privileges