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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 9120a1b00c9a3d5a08420a4bde233a545f5c0c0a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 12 22:30:09 2004 +0000

            Reviewed by me
    
            Remove cvs conflict indicators from ChangeLog
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7008 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1c2ae6..b3fa2d0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -85,8 +85,6 @@
         (DOM::Selection::validate): A selection is in caret state if the start and end are equal *or* equivalent.
         The equivalence case is new, and fixes 3723359.
 
-
->>>>>>> 1.2967
 2004-07-09  Kevin Decker  <kdecker at apple.com>
 
         Reviewed by Hyatt.

-- 
WebKit Debian packaging