[dnsenum/epel7] update

[Fabian Affolter]

commit 0062a272c185db7da9746ae87bb4ca20a0add548
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Tue Mar 24 07:23:40 2015 +0100

    update

 sources | 4 ----
 1 file changed, 4 deletions(-)
---
diff --git a/sources b/sources
index b747f65..041fe74 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5ad1c03bd63813a01a6d205e1da7a01e  1.2.4.1.tar.gz
-=======
 03d5961337ef5f4a47aca6d35f345caa  1.2.4.2.tar.gz
->>>>>>> master