[guake/f12/master] Fix sources

[Pierre-YvesChibon]

commit ea210ad9d33ed4ff009c098fd8b00dc61e3ccdf1
Author: pingou <pingou at pingoured.fr>
Date:   Thu Aug 5 11:52:41 2010 +0200

    Fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 7fc8ac6..acdef24 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-c3bd763f0a7c91cb453c32d8045fa6ca  guake-0.4.1.tar.gz
-=======
 1f0feff3bfc15c998147dbf07d9d8a8e  guake-0.4.2.tar.gz
->>>>>>> f13