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)
commitd70fe6183b9328f845c21ee6eeac9031136d5106
tree1c9093a1383792a13324b9643d9ecf2ce046d730
parentdd41a8fabeee66832f257383cafc6b6e912accee
Removed a stray conflict marker.

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