diff options
| author | wycats <wycats@gmail.com> | 2011-01-14 12:46:14 -0500 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2011-01-14 12:46:22 -0500 |
| commit | f4add19759678797ed8078a96d0c18b168df8588 (patch) | |
| tree | 53e1b12518657d68bacae77448587bab5e5f1aa2 | |
| parent | a7ab491a5d3c7347ee5685bd6df11092f0d638ca (diff) | |
| download | jquery-f4add19759678797ed8078a96d0c18b168df8588.tar.gz jquery-f4add19759678797ed8078a96d0c18b168df8588.zip | |
So embarrassing :(
| -rw-r--r-- | test/delegatetest.html | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/test/delegatetest.html b/test/delegatetest.html index efc206814..6479d26ec 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> |