[Collab-qa-commits] r237 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-18 10:22:48 +0000 (Mon, 18 Jun 2007)
New Revision: 237

Modified:
   fileconflicts/unstable-whitelist
Log:
cyrus-sasl2* now adds a diversion

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-18 10:16:47 UTC (rev 236)
+++ fileconflicts/unstable-whitelist	2007-06-18 10:22:48 UTC (rev 237)
@@ -6,6 +6,7 @@
 medit:referencer
 lesstif-doc:libmotif-dev
 g++:pentium-builder
+cyrus-sasl2-dbg:cyrus-sasl2-heimdal-dbg
 loop-aes-utils
 mount
 mesa-common-dev