Removed conflict marker.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b41e40c96f8cec990d70b0f2676492da63094a25..de6140852ffab3ba6aede4c81e43ea24a8520e46 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -68,7 +68,6 @@
         * khtml/xml/dom_docimpl.cpp:
         (DocumentImpl::detach): Took out the call to removeAllEventListenersFromAllNodes(). If we remove all event listeners here then when KHTMLPart::closeURL() checks for even listeners, it will never have any because they'll already be gone. 
 
->>>>>>> 1.4064
 2005-03-15  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Vicki