[tigase-xmltools/el5/master] Fix sources

[Matej Cepl]

commit bc02be73b503843abfb34e33aeb5d6627258fab7
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Oct 19 14:36:22 2010 +0200

    Fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 7be6375..208b760 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-74ab6e2467e0377880beac8ab02591b2  tigase-xmltools-3.3.4.tar.bz2
-=======
 ecfd59f564472e96f6cc3ae900456edf  tigase-xmltools-3.3.5.tar.bz2
->>>>>>> master