[bind-to-tinydns/el5: 13/13] Fix broken sources file

[Tim Jackson]

commit ffdb35cf94f7aaa522f3df6ce908a30102ee499f
Author: Tim Jackson <rpm at timj.co.uk>
Date:   Wed Feb 5 20:07:04 2014 +0100

    Fix broken sources file

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 08ce221..cabf3e2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-92657532ac03c439c85156554351b154  bind-to-tinydns-0.4.3.tar.gz
-=======
 bf4c6e027344fbab77e7cae9074a8a50  bind-to-tinydns-0.4.3-20140205git32dc9263.tar.bz2
->>>>>>> master