diff --git a/wordpress.spec b/wordpress.spec
index 86d5949..6a69032 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -191,7 +191,6 @@ rm -rf ${RPM_BUILD_ROOT}
 - New upstream beta1 version
 - Don’t even bother with removing gettext.php ... it is not used anymore
 
->>>>>>> master
 * Thu Sep 06 2012 Matej Cepl <mcepl@redhat.com> - 3.4.2-2
 - Upstream security update.