[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit d3a9a125509efc349d1e0827e04c6bf1b28bfa0e
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 8 22:08:52 2009 +0000

    Removed some conflict markers from the ChangeLog
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49325 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 35b2dc8..3762ec8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -35,7 +35,6 @@
         (JSC::JSValue::operator bool): Test for the empty value tag, instead
         of testing for the cell tag with a 0 payload.
 
-<<<<<<< .mine
 2009-10-08  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Sam Weinig.
@@ -70,7 +69,6 @@
         was a layering violation. A JSObject is implemented using a Structure; not
         the other way around.
 
-=======
 2009-10-08  Zoltan Herczeg  <zherczeg at inf.u-szeged.hu>
 
         Reviewed by Gavin Barraclough.
@@ -83,7 +81,6 @@
         * jit/JITCall.cpp:
         (JSC::JIT::compileOpCall):
 
->>>>>>> .r49322
 2009-10-07  Geoffrey Garen  <ggaren at apple.com>
 
         Windows build fix: removed no longer exported symbol.

-- 
WebKit Debian packaging