From 9152158e2ccb52eb5750e44cd44032e2a1857cb4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 18 Sep 2013 07:58:17 -0400 Subject: [PATCH] Fix merge conflicts --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4ca8a1681c..6ab27dea35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ phpMyAdmin - ChangeLog - bug #4068 Headline in operations not readable in IE10 - bug #4000 "Table does not contain unique column" message appears after adding a unique column +4.0.8.0 (not yet released) + 4.0.7.0 (not yet released) - bug #3993 Sorting in database overview with statistics doesn't work - bug Handle the situation where PHP_SELF is not set