Unreviewed build fix.

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

+2010-12-12  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Unreviewed build fix.
+
+        * WebCore.vcproj/WebCore.vcproj:
+        Remove accidentally-committed conflict marker.
+
 2010-10-28  MORITA Hajime  <morrita@google.com>
 
         Reviewed by Ojan Vafai.

WebCore/WebCore.vcproj/WebCore.vcproj

-<<<<<<< HEAD
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"