From da0609d1ae76c283c4f7f15454ca951be2685e6b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Dec 2012 15:25:20 -0500 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3cffac4e17..5882bd5dab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ VerboseMultiSubmit, ReplaceHelpImg - bug [core] Proxy ajax calls to pma.net to avoid browser notices - bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid SQL +- bug #3544366 [events] Event comments not saved 3.5.4.0 (2012-11-16) - bug #3570212 [edit] uuid_short() is a no-arguments function