X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=8c7ce8a40ef2446994239b90591d884cc1e5b774;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=468f6047be368084e608cba47a42f90af32cd53b;hpb=55d37c6b50d3fda758cd825fe5c6fc0932fcedaf;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 468f6047..8c7ce8a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -530,6 +530,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>