diff -r 740e5562c97f -r b5b118452c7d src/3rdparty/webkit/VERSION
--- a/src/3rdparty/webkit/VERSION	Fri Apr 16 11:39:52 2010 +0300
+++ b/src/3rdparty/webkit/VERSION	Mon Apr 19 10:15:19 2010 +0300
@@ -8,8 +8,5 @@
 
 and has the sha1 checksum
 
-<<<<<<< HEAD
-        e9151b11e974f0aa47fd40c225f88f35ced91496
-=======
         14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62
->>>>>>> 8f75ee7... Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
+