From 90015cc4e2750786158a5f8fe827e8e7d8b06f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
Date: Fri, 28 Dec 2012 09:57:12 +0100
Subject: [PATCH] Remove merge marker

---
 wordpress.spec | 1 -
 1 file changed, 1 deletion(-)

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.