[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c155011a3f2e65af0d99b715b8a5459254d189b4
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 06:31:55 2010 +0000

    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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b90da4f..9f7f99a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-12  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Unreviewed build fix.
+
+        * WebCore.vcproj/WebCore.vcproj:
+        Remove accidentally-committed conflict marker.
+
 2010-10-28  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Ojan Vafai.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index a1bdc33..8d74bcb 100755
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"

-- 
WebKit Debian packaging