X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=a2e9ed6eeb0d5d2b754c119ccd0679a0db9fa998;hb=006cbdd7669733c100b5ff59352c15591b11ff0f;hp=3c68e7580e29a6451320ccbe0ab03bb5a34ad14d;hpb=30fe03b3dbcd1766c078ea9845a43a12f961dcf2;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 3c68e758..a2e9ed6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -557,6 +557,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>