Remove conflict marker
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Dec 2004 16:29:00 +0000 (16:29 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Dec 2004 16:29:00 +0000 (16:29 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8180 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23

index 6a1891bb091357fe40f4cf39a5791331d0563578..3cba35ba082d68281c5d2a4a977fa281e2947b1d 100644 (file)
@@ -80,7 +80,6 @@
 
 === Safari-175 ===
 
->>>>>>> 1.3603
 2004-12-09  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John