[Lunar-commits] CVS: moonbase/mail/sylpheed CONFLICTS,1.3,1.4

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/mail/sylpheed
In directory espresso.foo-projects.org:/tmp/cvs-serv5245/sylpheed

Modified Files:
	CONFLICTS 
Log Message:
wee


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/sylpheed/CONFLICTS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CONFLICTS	3 Feb 2003 20:20:05 -0000	1.3
+++ CONFLICTS	1 Feb 2005 16:10:44 -0000	1.4
@@ -1 +1,2 @@
-conflicts sylpheed-claws
+conflicts sylpheed-claws &&
+conflicts sylpheed-dev