Fixed merge conflicts

This commit is contained in:
Rouslan Placella 2012-12-07 16:29:37 +00:00
parent ac214db689
commit f9deae4e3f

View File

@ -3102,7 +3102,7 @@ AJAX.registerOnload('functions.js', function() {
/**
* Load version information asynchronously.
*/
if ($('.jsversioncheck').length > 0) {
if ($('li.jsversioncheck').length > 0) {
$.getJSON('version_check.php', {}, PMA_current_version);
}