From: wycats <wycats@gmail.com>
Date: Fri, 14 Jan 2011 17:46:14 +0000 (-0500)
Subject: So embarrassing :(
X-Git-Tag: 1.5b1~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f4add19759678797ed8078a96d0c18b168df8588;p=jquery.git

So embarrassing :(
---

diff --git a/test/delegatetest.html b/test/delegatetest.html
index efc206814..6479d26ec 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -229,22 +229,14 @@
 	$(document).bind("change", function(){
 		jQuery("#boundChange").blink();
 	});
-<<<<<<< HEAD
 
-=======
-	
->>>>>>> Overwrite CRLF with LF
 	$("#text_submit").addSubmitTest("#textSubmit", true);
 	$("#password_submit").addSubmitTest("#passwordSubmit", true);
 	$("#submit_submit").addSubmitTest("#submitSubmit", true);
 	$(document).bind("submit", function(){
 		jQuery("#boundSubmit").blink();
 	});
-<<<<<<< HEAD
 
-=======
-	
->>>>>>> Overwrite CRLF with LF
         </script>
     </body>
 </html>