[ingo/el5/master] Fix sources file

[Nick Bebout]

commit ed36c178f3111df633eadfd0b1c22cecffb32f74
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 9 20:57:57 2011 +0000

    Fix sources file

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 9a739d8..303d81b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-2c61da8e403ecce50cfc40876cac163c  ingo-h3-1.2.tar.gz
-=======
 a394a02f0a3e3cf4cc57fd6c19712f29  ingo-h3-1.2.5.tar.gz
->>>>>>> master