[Lunar-commits] r21332 - moonbase/trunk/zbeta/XOrg-test

[Dennis Veatch]

Author: stumbles
Date: 2006-09-07 13:58:38 +0000 (Thu, 07 Sep 2006)
New Revision: 21332

Modified:
   moonbase/trunk/zbeta/XOrg-test/CONFLICTS
Log:

This should have it as well.


Modified: moonbase/trunk/zbeta/XOrg-test/CONFLICTS
===================================================================
--- moonbase/trunk/zbeta/XOrg-test/CONFLICTS	2006-09-07 13:57:30 UTC (rev 21331)
+++ moonbase/trunk/zbeta/XOrg-test/CONFLICTS	2006-09-07 13:58:38 UTC (rev 21332)
@@ -1,3 +1,4 @@
-conflicts xfree86 &&
+conflicts xfree86      &&
 conflicts xfree86-beta &&
-conflicts XOrg
+conflicts XOrg         &&
+conflicts XOrg7