From 7f16f91b3bc6f45cf4e662b03bfec7d4f87215c3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 29 Mar 2013 08:18:12 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 0c2e874c14..0fa095973f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ underscore 3.5.8.0 (not yet released) - bug #3828 MariaDB reported as MySQL - bug #3854 Incorrect header for Safari 6.0 +- bug #3705 Attempt to open trigger for edit gives NULL 3.5.7.0 (2013-02-15) - bug #3779 [core] Problem with backslash in enum fields