[neon/f13/master] fix sources

[jorton]

commit 30399db292767fdffe3a2dbac9512008581c0146
Author: Joe Orton <jorton at redhat.com>
Date:   Fri Oct 1 17:04:16 2010 +0100

    fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 0c63867..58acbd6 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-ba1015b59c112d44d7797b62fe7bee51  neon-0.29.3.tar.gz
-=======
 29438dbdaee84db2d7fbc73248a92d93  neon-0.29.4.tar.gz
->>>>>>> origin/master