From d4fb35bd2985dc097a691cab4c5975125cb917fb Mon Sep 17 00:00:00 2001
From: Vangelis Mouhtsis <vangelis@gnugr.org>
Date: Tue, 13 May 2014 21:20:59 +0300
Subject: [PATCH] debian/changelog: fix changelog to its former update

---
 debian/changelog | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47349f1..8dddd40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
-mate-applets (1.8.0-1) UNRELEASED; urgency=low
-
-  * Initial release. (Closes: #734888).
-
- -- Vangelis Mouhtsis <vangelis@gnugr.org>  Fri, 18 Apr 2014 17:34:09 +0300
-=======
 mate-applets (1.8.0+dfsg1-1) unstable; urgency=low
 
   * Initial release. (Closes: #734888).
 
  -- Mike Gabriel <sunweaver@debian.org>  Mon, 21 Apr 2014 13:57:07 +0200
->>>>>>> bb4b4c5019deb87fbc0ff0e7ea126804c31daba5