[mate-notification-daemon/f20] fix sources

[Wolfgang Ulbrich]

commit fbb7939a471cd7081985a4b7de0576acd22f29c9
Author: raveit65 <chat-to-me at raveit.de>
Date:   Thu Oct 23 02:06:08 2014 +0200

    fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index f698154..a767cfd 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f9cb50a86c30bccc8728adcbf6a04f32  mate-notification-daemon-1.8.0.tar.xz
-=======
 305d64a23982479575dfd169a00ff398  mate-notification-daemon-1.8.1.tar.xz
->>>>>>> f21