[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[mjs at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit cc179b3d05c9059a8190a9f5547f52a7bc9a3cee
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 03:43:31 2009 +0000

    Remove stray conflict marker.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b8ae51f..5a6e3eb 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -50,7 +50,6 @@
         (WTF::RefCountedBase::derefBase):
         * wtf/ThreadVerifier.h: Removed.
 
->>>>>>> .r51879
 2009-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging