CVS: moonbase/zbeta/xfce4-session-cvs CONFLICTS,1.1,1.2

[moe at lunar-linux.org]

Update of /var/cvs/lunar/moonbase/zbeta/xfce4-session-cvs
In directory dbguin.lunar-linux.org:/tmp/cvs-serv1265

Modified Files:
	CONFLICTS 
Log Message:
Forgot a little "conflicts" .. eh jazman? ;-)


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfce4-session-cvs/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS	24 Jul 2003 07:33:19 -0000	1.1
+++ CONFLICTS	26 Jul 2003 20:01:46 -0000	1.2
@@ -1 +1 @@
-xfce4-session
+conflicts xfce4-session