[mate-text-editor/f19] fix conflicts in sources

[Wolfgang Ulbrich]

commit bce2d7840f097605fc6127198709921c356e34ef
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Jan 1 16:37:08 2014 +0100

    fix conflicts in sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 194bfaf..37c5051 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
 3cfbd6d709b74e57b9b907c141ba5fdb  mate-text-editor-1.6.1.tar.xz
-=======
-6bf33a42e00a716b878b2991550edd57  mate-text-editor-1.7.0.tar.gz
->>>>>>> master