diff options
| author | wycats <wycats@gmail.com> | 2011-01-14 10:36:45 -0500 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2011-01-14 10:39:06 -0500 |
| commit | 3716f2d0416895e1220269ea2e8bb23b8b843db0 (patch) | |
| tree | fb180b513249b67b5af02bbaa6f94a26abd9dfdc /test/delegatetest.html | |
| parent | d483ce0a9c8b19dafa70be93ca071673b86a65e2 (diff) | |
| download | jquery-3716f2d0416895e1220269ea2e8bb23b8b843db0.tar.gz jquery-3716f2d0416895e1220269ea2e8bb23b8b843db0.zip | |
Overwrite CRLF with LF
Diffstat (limited to 'test/delegatetest.html')
| -rw-r--r-- | test/delegatetest.html | 8 |
1 files changed, 8 insertions, 0 deletions
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> |