[perl-Net-Whois-IP/el6] update sources

[Fabian Affolter]

commit 17bbde04608674a74497a90740a3a865eb308f54
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Wed Oct 1 13:23:13 2014 +0200

    update sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index f835c91..ff72fb3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-67edb62a49801464e0b4c6049cfbdfc4  Net-Whois-IP-1.10.tar.gz
-=======
 6c0ab0a3767fc293a54d870d8bcf1554  Net-Whois-IP-1.15.tar.gz
->>>>>>> master