Fix merge conflicts

This commit is contained in:
Marc Delisle 2011-10-03 12:42:35 -04:00
parent 0baec64a64
commit 2ff7b4cc93

View File

@ -50,6 +50,8 @@ phpMyAdmin - ChangeLog
+ Support Drizzle database
- bug #3356456 [interface] Interface problems for queries having LIMIT clauses
3.4.7.0 (not yet released)
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
- bug #3404886 [navi] Edit SQL statement after error