Overwrite CRLF with LF

diff --git a/test/delegatetest.html b/test/delegatetest.html
index 6479d26ecc8b6036d46aac3d773ea3bce3248a31..efc206814a0a1779400fcd3bab580809e0ca2e65 100644 (file)
--- 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>