[Collab-qa-commits] r242 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-21 07:39:10 +0000 (Thu, 21 Jun 2007)
New Revision: 242

Modified:
   fileconflicts/unstable-whitelist
Log:
hey, those are really conflicting ..

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-20 13:27:10 UTC (rev 241)
+++ fileconflicts/unstable-whitelist	2007-06-21 07:39:10 UTC (rev 242)
@@ -2,7 +2,6 @@
 bitchx:bitchx-ssl
 unace:unace-nonfree
 xmms:xmms-mpg123-ja
-aide:aide-xen
 medit:referencer
 lesstif-doc:libmotif-dev
 g++:pentium-builder