gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-08-29 16:21:15 +02:00
parent bb7786ee6b
commit f05beef761
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/operations.lib.php
View File

@ -252,11 +252,7 @@ function PMA_getHtmlForCopyDatabase($db)
. '" disabled/>';
}
$html_output .= '<label for="checkbox_privileges">'
<<<<<<< HEAD
. __('Adjust privileges') . PMA_Util::showDocu('faq', 'faq6-39')
=======
. __('Adjust Privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
>>>>>>> Set namespace on Advisor, Config, Console and Util classes.
. __('Adjust privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
. '</label><br />';
}
@ -886,11 +882,7 @@ function PMA_getHtmlForMoveTable()
. '" disabled/>';
}
$html_output .= '<label for="checkbox_privileges_tables_move">'
<<<<<<< HEAD
. __('Adjust privileges') . PMA_Util::showDocu('faq', 'faq6-39')
=======
. __('Adjust Privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
>>>>>>> Set namespace on Advisor, Config, Console and Util classes.
. __('Adjust privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
. '</label><br />';
}
@ -984,13 +976,8 @@ function PMA_getHtmlForRenameTable()
. '" disabled/>';
}
$html_output .= '<label for="checkbox_privileges_table_options">'
<<<<<<< HEAD
. __('Adjust privileges') . '&nbsp;'
. PMA_Util::showDocu('faq', 'faq6-39') . '</label>';
=======
. __('Adjust Privileges') . '&nbsp;'
. PMA\libraries\Util::showDocu('faq', 'faq6-39') . '</label>';
>>>>>>> Set namespace on Advisor, Config, Console and Util classes.
}
$html_output .= '</td></tr>';
@ -1343,11 +1330,7 @@ function PMA_getHtmlForCopytable()
. '" disabled/>';
}
$html_output .= '<label for="checkbox_adjust_privileges">'
<<<<<<< HEAD
. __('Adjust privileges') . PMA_Util::showDocu('faq', 'faq6-39')
=======
. __('Adjust Privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
>>>>>>> Set namespace on Advisor, Config, Console and Util classes.
. __('Adjust privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
. '</label><br />';
}