From: Evgeni Golov <evgeni@grml.org>
Date: Wed, 6 Jan 2016 17:07:02 +0000 (+0100)
Subject: fix changelog after merge
X-Git-Tag: debian/1%20151213+grml.1~4
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=f67375f42194f1319e65fc8e91ad3ce449fb3d65

fix changelog after merge
---

diff --git a/debian/changelog b/debian/changelog
index ecafa41..7ebbb29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,6 @@ live-boot (5.0~a5-2) unstable; urgency=low
   * Removing myself from uploaders, lost trust in Debian (#804315).
 
  -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 20 Nov 2015 13:04:24 +0100
->>>>>>> debian
 
 live-boot (5.0~a5-1+grml.1) UNRELEASED; urgency=medium