[mate-themes/f20] fix source file

[Wolfgang Ulbrich]

commit d036d4aeff5a8fed526640e9bd613e85be11a7b0
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri May 16 02:58:46 2014 +0200

    fix source file

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 720b0f5..ba7d3bb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e5943c625aea07bef8c012a725e9df8e  mate-themes-1.7.3-git20140304-5a900ef.tar.xz
-=======
 5c348c11eb78c0ee0442ee429132d2c7  mate-themes-1.8.1.tar.xz
->>>>>>> master