From fa16a717bca507ce3268cef1bef55b7e34d199a4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 8 May 2013 13:08:30 -0400 Subject: [PATCH] Fix merge conflict --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 28078ebca8..dc56ef6871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,6 @@ phpMyAdmin - ChangeLog ====================== -<<<<<<< HEAD 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