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)
* 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

index b90da4f..9f7f99a 100644 (file)
@@ -1,3 +1,10 @@
+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.
index a1bdc33..8d74bcb 100755 (executable)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"