[Lunar-commits] CVS: moonbase/zbeta/apollon-cvs CONFLICTS, NONE, 1.1 DEPENDS, 1.1, 1.2

[Florin Braescu]

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

Modified Files:
	DEPENDS 
Added Files:
	CONFLICTS 
Log Message:
add a conflict file regarding apollon.


--- NEW FILE: CONFLICTS ---
conflicts apollon

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/apollon-cvs/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS	2 Aug 2004 22:15:36 -0000	1.1
+++ DEPENDS	3 Aug 2004 04:20:10 -0000	1.2
@@ -1,8 +1,6 @@
-conflicts apollon &&
-
 depends  kdelibs3 &&
 depends  gift-cvs && 
 
 optional_depends "giftgnutella-cvs" "" "" "giFT Gnutella plugin" &&
-optional_depends "giftfast-cvs" "" "" "giFT FastTrack (KaZaa) plugin" &&
-optional_depends "giftopenft-cvs" "" "giFT OpenFT plugin" 
+optional_depends "giftopenft-cvs"   "" "" "giFT OpenFT plugin"   && 
+optional_depends "giftfast-cvs"     "" "" "giFT FastTrack (KaZaa) plugin"