chiark
/
gitweb
/
~ianmdlvl
/
developers-reference.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
remove conflict artifact
[developers-reference.git]
/
debian
/
changelog
diff --git
a/debian/changelog
b/debian/changelog
index c77679c659c21fa218a5abb3b6f48932a4f33302..ea0551fb42fd169631e823985ca49ae1dc4fe8c6 100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-15,7
+15,6
@@
developers-reference (3.3.4) WORKING VERSION; urgency=low
-- Adam Di Carlo <aph@debian.org> Mon, 16 Jun 2003 04:22:22 -0400
->>>>>>> 1.168
developers-reference (3.3.3) unstable; urgency=low
* Frédéric Bothamy