X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;fp=debian%2Fchangelog;h=7ebbb29f56dfde8046530fc1719cc70d5fa73c26;hb=f67375f42194f1319e65fc8e91ad3ce449fb3d65;hp=ecafa4171f2779cb6efa70607e4aca6bfe56114b;hpb=09d84680546794cf22c42e7e1a943072b2e24634;p=live-boot-grml.git

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