From f9deae4e3f32aa87834cf911d43177e802e0b476 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Fri, 7 Dec 2012 16:29:37 +0000
Subject: [PATCH] Fixed merge conflicts

---
 js/functions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/functions.js b/js/functions.js
index de881f8251..7310a1948b 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -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);
     }