From b1855ec0b428ea8ba62f752e5fdca51c5b3881a9 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sun, 10 Jun 2012 14:46:55 +0100 Subject: Fixed bug #3534121 - duplicate line in config.sample.inc.php --- ChangeLog | 1 + config.sample.inc.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 310bd1bb0c..571627341a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #3531584 [interface] No form validation in change password dialog - bug #3531585 [interface] Broken password validation in copy user form - bug #3531586 [unterface] Add user form prints JSON when user presses enter +- bug #3534121 [config] duplicate line in config.sample.inc.php 3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/config.sample.inc.php b/config.sample.inc.php index a98d548022..da61640ffa 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -58,7 +58,6 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; // $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; // $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig'; // $cfg['Servers'][$i]['recent'] = 'pma_recent'; -// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs'; /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; -- cgit v1.2.3