X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=test%2Fdelegatetest.html;h=6479d26ecc8b6036d46aac3d773ea3bce3248a31;hp=efc206814a0a1779400fcd3bab580809e0ca2e65;hb=9d306bd73bb47562cd52f0fc4cc158c534cfdfdf;hpb=3716f2d0416895e1220269ea2e8bb23b8b843db0

diff --git a/test/delegatetest.html b/test/delegatetest.html
index efc2068..6479d26 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>