[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 82bd6537a5e6409f0168a54c9144e7ddb538309d
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 5 17:46:26 2003 +0000

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1b7c72c..82aab86 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -227,7 +227,6 @@
 
         Reviewed by Maciej.
 
->>>>>>> 1.2044
         - fixed 3321247 -- window size box disappears from Help window (caused by WebKit NSView hackery)
 
         * WebView.subproj/WebHTMLViewPrivate.m:

-- 
WebKit Debian packaging