merge months of changes on ftp-master, see ChangeLog

[dak.git] / TODO

diff --git a/TODO b/TODO
index b7c246117c2c7900dffb144b3b8872c3d6b5e096..e8a3d6a92f90b5393c20caa26780761065eaa833 100644 (file)
--- a/TODO
+++ b/TODO
@@ -227,7 +227,7 @@ Others
     * arch != {any,all}
     * build-depends wrong (via andrea)
     * suid
-    * conficlits
+    * conflicts
     * notification/stats to admin daily
     o trap fernanda exiting
     o distinguish binary only versus others (neuro)