From: wycats <wycats@gmail.com>
Date: Fri, 14 Jan 2011 15:36:45 +0000 (-0500)
Subject: Overwrite CRLF with LF
X-Git-Tag: 1.5b1~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3716f2d0416895e1220269ea2e8bb23b8b843db0;p=jquery.git

Overwrite CRLF with LF
---

diff --git a/test/delegatetest.html b/test/delegatetest.html
index 6479d26ec..efc206814 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -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>