[Lunar-commits] CVS: moonbase/zbeta/XOrg-test CONFLICTS,1.2,1.3

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/zbeta/XOrg-test
In directory espresso.foo-projects.org:/tmp/cvs-serv22640

Modified Files:
	CONFLICTS 
Log Message:
Unbreak this


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/XOrg-test/CONFLICTS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CONFLICTS	6 Mar 2005 11:58:55 -0000	1.2
+++ CONFLICTS	6 Mar 2005 14:30:11 -0000	1.3
@@ -1,3 +1,3 @@
 conflicts xfree86 &&
 conflicts xfree86-beta &&
-conflicts XOrg-test
+conflicts XOrg