[wordpress/f14/master] Spec error.

[Jon Ciesla]

commit 8c600ef208f28a47c96b14eb1fd1f0b1d995b511
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Mar 21 09:25:14 2011 -0500

    Spec error.

 wordpress.spec |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/wordpress.spec b/wordpress.spec
index 710c531..454a02f 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -99,15 +99,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/wordpress/wp-signup.php
 
 %changelog
-<<<<<<< HEAD
-* Mon Jan 03 2011 Jon Ciesla <limb at jcomserv.net> - 2.8.6-4
-- Patch for security vulnerability, BZ 666782.
-
-* Thu Dec 23 2010 Jon Ciesla <limb at jcomserv.net> - 2.8.6-3
-- Change Requires from httpd to webserver, BZ 523480.
-- Patch for Hello Dolly lyrics, BZ 663966.
-- Patch for security vulnerability, BZ 659319.
-
 * Wed Feb 23 2011 Jon Ciesla <limb at jcomserv.net> - 3.1-1
 - 3.1.