Unreviewed build fix.
authorjhoneycutt@apple.com <jhoneycutt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Dec 2010 06:31:55 +0000 (06:31 +0000)
committerjhoneycutt@apple.com <jhoneycutt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Dec 2010 06:31:55 +0000 (06:31 +0000)
commit84f5573d1ca1d118677ebf47c35fffb1ef18b16a
treefc3b06b6cf0af4d94f50e3931c4cb9ebb2f641ad
parentfb7a66cc22ab5a3dce06225437c7b26c50bb1c30
Unreviewed build fix.

* WebCore.vcproj/WebCore.vcproj:
Remove accidentally-committed conflict marker.

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