[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[barraclough at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 14fdf7c7fdb8a1c96c19fcb3a51c33667adecdf7
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 26 22:20:25 2010 +0000

    Whoops, fixerate ChangeLog.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1639cee..1db5c9e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 2010-01-25  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Anders Carlsson.
@@ -22,7 +21,6 @@
         * bridge/jni/jsc/JavaInstanceJSC.cpp:
         (JavaInstance::stringValue):
 
-=======
 2010-01-26  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Oliver Hunt.
@@ -365,7 +363,6 @@
         (WebCore::XMLTokenizer::XMLTokenizer):
         (WebCore::parseXMLDocumentFragment):
 
->>>>>>> .r53864
 2010-01-22  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging