Commit c155011a authored by jhoneycutt@apple.com's avatar jhoneycutt@apple.com

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
parent 7a18feed
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.
......
<<<<<<< HEAD
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment