[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-699-g3f8f9b1

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 05b75356c641477f70ccb830241cda31d6f628f7
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Wed Jan 20 22:33:43 2010 -0200

    Fixing bad merge resolution

diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
index 246c957..02d1a53 100644
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
@@ -210,9 +210,6 @@ void EditorClient::respondToChangedSelection()
     }
 #endif
 
-    pasteboardHelperInstance()->writeClipboardContents(clipboard, corePage);
-#endif
-
     if (!targetFrame->editor()->hasComposition())
         return;
 

-- 
WebKit Debian packaging