Unreviewed build fix.
[WebKit-https.git] / WebCore / ChangeLog
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.