[dnsenum/epel7] fix merge error

[Fabian Affolter]

commit 61fdaa37e9bbf7052f882badd51dbca00e973cb0
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Tue Mar 24 00:53:33 2015 +0100

    fix merge error

 dnsenum.spec | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/dnsenum.spec b/dnsenum.spec
index 75a7f3b..b83486c 100644
--- a/dnsenum.spec
+++ b/dnsenum.spec
@@ -1,9 +1,5 @@
-Name:       dnsenum 
-<<<<<<< HEAD
-Version:    1.2.4.1
-=======
+Name:       dnsenum
 Version:    1.2.4.2
->>>>>>> master
 Release:    1%{?dist}
 Summary:    A tool to enumerate DNS info about domains 
 
@@ -38,12 +34,9 @@ perform reverse lookups on netranges, writes ip-blocks to domain_ips.txt.
 %{_bindir}/%{name}
 
 %changelog
-<<<<<<< HEAD
-=======
 * Mon Mar 23 2015 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.4.2-1
 - Update to latest upstream release 1.2.4.2
 
->>>>>>> master
 * Fri Sep 12 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.4.1-1
 - Update to latest upstream release 1.2.4.1