From: wycats Date: Fri, 14 Jan 2011 15:36:45 +0000 (-0500) Subject: Overwrite CRLF with LF X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;ds=sidebyside;h=3716f2d0416895e1220269ea2e8bb23b8b843db0;p=jquery.git Overwrite CRLF with LF --- diff --git a/test/delegatetest.html b/test/delegatetest.html index 6479d26..efc2068 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