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

[jasper at lunar-linux.org]

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

Modified Files:
	CONFLICTS 
Log Message:
Add proper conflicts with stable version

Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/xfce4-cvs/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS	23 Mar 2003 23:32:51 -0000	1.1
+++ CONFLICTS	24 Jul 2003 07:33:18 -0000	1.2
@@ -1 +1 @@
-conflicts xfce4
+conflicts xfce4-panel