From 22dd1e5d33670c5ae58e91819f572a6b10161ff1 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Fri, 12 Aug 2016 21:38:54 +0200
Subject: [PATCH] update to 1.14.1 release

---
 mate-settings-daemon.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 371c67f..f6ae206 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -146,14 +146,10 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
-* Sun Jun 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
-=======
 * Fri Aug 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.1-1
 - update to 1.14.1 release
 
-* Wed Apr 06 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
->>>>>>> f91719f... update to 1.14.1 release
+* Sun Jun 12 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
 - update to 1.14.0 release
 
 * Fri Dec 04 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> 1.12.1-1