[wordpress/f18] Remove merge marker

[Matej Cepl]

commit 90015cc4e2750786158a5f8fe827e8e7d8b06f63
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Dec 28 09:57:12 2012 +0100

    Remove merge marker

 wordpress.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
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 at redhat.com> - 3.4.2-2
 - Upstream security update.