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

[darin]

The following commit has been merged in the debian/unstable branch:
commit fe1c1a930564925215b8ce6723a49eac357ea2ca
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 11 06:23:13 2003 +0000

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

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d1ab7f8..0ec59cc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -104,7 +104,6 @@
         * khtml/html/htmltokenizer.cpp:
         (HTMLTokenizer::parseTag): use tolower() to lowercase a char, don't use | 0x20 because that will cause chars like '_' to turn into junk
 
->>>>>>> 1.1814
 2003-07-08  Dave Hyatt  <hyatt at apple.com>
 
 	Implementation of inline-block and a prototype of the XUL
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d1ab7f8..0ec59cc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -104,7 +104,6 @@
         * khtml/html/htmltokenizer.cpp:
         (HTMLTokenizer::parseTag): use tolower() to lowercase a char, don't use | 0x20 because that will cause chars like '_' to turn into junk
 
->>>>>>> 1.1814
 2003-07-08  Dave Hyatt  <hyatt at apple.com>
 
 	Implementation of inline-block and a prototype of the XUL

-- 
WebKit Debian packaging