Removed a stray conflict marker.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Jul 2006 03:05:24 +0000 (03:05 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Jul 2006 03:05:24 +0000 (03:05 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

index e38fc34ff08d510366bbabf20effaa37ed424eb4..591e7b95c58787869a22f3fe708b091ce4ef615a 100644 (file)
@@ -75,7 +75,6 @@
 
 === Safari-521.20 ===
 
->>>>>>> .r15564
 2006-07-21  Tim Omernick  <timo@apple.com>
 
         Reviewed by Beth Dakin & John Sullivan.