X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=debian%2Fchangelog;h=ea0551fb42fd169631e823985ca49ae1dc4fe8c6;hp=c77679c659c21fa218a5abb3b6f48932a4f33302;hb=c7c703ea4d9fdc9f79c4d61c97b8214fa7cfa354;hpb=4961519caa41c56bfa83372062f43aac5bfb4aec

diff --git a/debian/changelog b/debian/changelog
index c77679c..ea0551f 100644
--- 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