X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=730146e4510bcb28832316ff358d002aa60110a5;hb=30b1d57ed3df70b938f29044742ecae59c570d99;hp=31085d640649ee71878fa746e66f7a157e4bbcd9;hpb=aa43d9d1dd9d440c22c86c93d195c1b2b15ce216;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 31085d64..730146e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -538,6 +538,7 @@
 	* dak/stats.py: likewise
 	* dak/symlink_dists.py: likewise
 	* dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>