projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix changelog after merge
[live-boot-grml.git]
/
debian
/
changelog
diff --git
a/debian/changelog
b/debian/changelog
index
ecafa41
..
7ebbb29
100644
(file)
--- 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