fixed: unit test

blablacio · Oct 3, 2012 · 87329f2 · 87329f2
1 parent 03674e5
commit 87329f2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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>" );