From 6591f6dd9d1c86144903f60e5d19e624c5bf6751 Mon Sep 17 00:00:00 2001
From: jeresig <jeresig@gmail.com>
Date: Mon, 11 Apr 2011 11:22:52 -0400
Subject: [PATCH] Fix broken merge.

---
 test/unit/traversing.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 6228a0b9..f622082e 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -223,10 +223,6 @@ test("closest(Array)", function() {
 	same( jQuery("body").closest(["span","html"]), [{selector:"html", elem:document.documentElement, level:2}], "closest([body, html])" );
 });
 
-<<<<<<< HEAD
-test("not(Selector|undefined)", function() {
-	expect(11);
-=======
 test("closest(jQuery)", function() {
 	expect(8);
 	var $child = jQuery("#nothiddendivchild"),
@@ -243,9 +239,8 @@ test("closest(jQuery)", function() {
 	ok( $child.closest( $body.add($parent) ).is('#nothiddendiv'), "Closest ancestor retrieved." );
 });
 
-test("not(Selector)", function() {
-	expect(7);
->>>>>>> 1a167767305202797cf4c839eb64bd7adfb00182
+test("not(Selector|undefined)", function() {
+	expect(11);
 	equals( jQuery("#main > p#ap > a").not("#google").length, 2, "not('selector')" );
 	same( jQuery("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
 	same( jQuery("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );