Fix merge conflicts

This commit is contained in:
Marc Delisle 2013-03-29 08:18:12 -04:00
parent e7257bbce1
commit 7f16f91b3b

View File

@ -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