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

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory espresso.foo-projects.org:/tmp/cvs-serv5488

Modified Files:
	CONFLICTS 
Log Message:
hilarious


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/CONFLICTS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CONFLICTS	22 Nov 2004 18:31:38 -0000	1.2
+++ CONFLICTS	23 Nov 2004 16:32:14 -0000	1.3
@@ -1,4 +1,3 @@
 conflicts xfree86 &&
 conflicts xfree86-beta &&
-conflicts XOrg &&
 conflicts XOrg-test