[validns/el5] left in merge line

[Paul Wouters]

commit 050a58c24ae6a3f041e8f20583a45e24f8351e50
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 4 18:40:35 2012 -0400

    left in merge line

 validns.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/validns.spec b/validns.spec
index eae9e39..443e800 100644
--- a/validns.spec
+++ b/validns.spec
@@ -35,7 +35,6 @@ rm -rf %{buildroot}
 %{_mandir}/man1/validns.1.gz
 
 %changelog
-<<<<<<< HEAD
 * Thu Oct 04 2012 Paul Wouters <pwouters at redhat.com> - 0.6-0
 - Updated to 0.6, which incorporates all patches