Unreviewed build fix.
[WebKit-https.git] / WebCore / WebCore.vcproj / WebCore.vcproj
index a1bdc33..8d74bcb 100755 (executable)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"