diff --git a/kdevelop.spec b/kdevelop.spec
index 9e17750..19903a2 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -167,7 +167,6 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jul 07 2005 Than Ngo <than@redhat.com> 8:3.2.1-3
 - fix uninitialized variable warning #162367
 
->>>>>>> 1.34
 * Thu Jun 30 2005 Than Ngo <than@redhat.com> 9:3.2.1-2
 - apply patch to fix undefined symbol issue #162146