* ChangeLog: removed conflict marker
authorcblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Dec 2004 01:25:04 +0000 (01:25 +0000)
committercblu <cblu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Dec 2004 01:25:04 +0000 (01:25 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23

index 2767bb4..4abbcc2 100644 (file)
@@ -1,5 +1,9 @@
 2004-11-30  Chris Blumenberg  <cblu@apple.com>
 
+        * ChangeLog: removed conflict marker
+
+2004-11-30  Chris Blumenberg  <cblu@apple.com>
+
        Fixed:
        <rdar://problem/3685766> WebDataSource is missing subresources when they use cached WebCore data
        <rdar://problem/3722434> REGRESSION?: Assertion failure trying to drag image in iframe (itapema.sc.gov.br)
@@ -50,7 +54,6 @@
 
         Reviewed by John.
 
->>>>>>> 1.3551
        - fix recent regression from collection perf fixes.
        
         * khtml/html/html_miscimpl.cpp: