diff -r 453da2cfceef -r 71781823f776 qtmobility/dist/changes-1.0.0-beta1
--- a/qtmobility/dist/changes-1.0.0-beta1	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/dist/changes-1.0.0-beta1	Thu May 27 13:42:11 2010 +0300
@@ -385,11 +385,6 @@
 
  -
 
-<<<<<<< HEAD:dist/changes-1.0.0-beta1
-Qt Mobility for Symbian
-------
-
-=======
 Qt Mobility for Maemo5
 ------