[Lunar-commits] r22699 - moonbase/trunk/distributed/nicotine+

[Samuel Verstraete]

Author: elangelo
Date: 2006-12-22 09:23:06 +0100 (Fri, 22 Dec 2006)
New Revision: 22699

Modified:
   moonbase/trunk/distributed/nicotine+/CONFLICTS
Log:
meh!
gr,S.


Modified: moonbase/trunk/distributed/nicotine+/CONFLICTS
===================================================================
--- moonbase/trunk/distributed/nicotine+/CONFLICTS	2006-12-22 08:19:04 UTC (rev 22698)
+++ moonbase/trunk/distributed/nicotine+/CONFLICTS	2006-12-22 08:23:06 UTC (rev 22699)
@@ -1 +1,2 @@
 conflicts nicotine
+conflicts psyco