fixed: unit test

diff --git a/tests/jquery.js b/tests/jquery.js
index e768dafdda112d79b188916fec599c7150719800..d8e4570ecd5d259eb0a478996089e5c807714d57 100644 (file)
--- a/tests/jquery.js
+++ b/tests/jquery.js
@@ -18,11 +18,7 @@ for ( ; i < length; i++ ) {
 if ( version === "git" ) {
        url = "http://code.jquery.com/jquery-git.js";
 } else {
-<<<<<<< HEAD
-       url = "../../../jquery-" + ( version || "1.7.2" ) + ".js";
-=======
        url = "../../jquery-" + ( version || "1.8.2" ) + ".js";
->>>>>>> 1.8.24
 }
 
 document.write( "<script src='" + url + "'></script>" );