X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Fdelegatetest.html;h=efc206814a0a1779400fcd3bab580809e0ca2e65;hb=3716f2d0416895e1220269ea2e8bb23b8b843db0;hp=327085c84b081e044927cea143292b2c1cbbdf51;hpb=4190059c762f253fa9231d4493db8dead59b7b09;p=jquery.git

diff --git a/test/delegatetest.html b/test/delegatetest.html
index 327085c..efc2068 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -206,7 +206,7 @@
 	$(document).bind("focusin", function() {
 		jQuery("#boundFocus").blink();
 	});
-	
+
 	$(document).bind("focusout", function() {
 		jQuery("#boundBlur").blink();
 	});
@@ -229,14 +229,22 @@
 	$(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>