CVS: moonbase/ftp/lftp CONFLICTS,1.1.1.1,1.2

[Auke Kok]

Update of /var/cvs/lunar/moonbase/ftp/lftp
In directory dbguin.lunar-linux.org:/tmp/cvs-serv25273/lftp

Modified Files:
	CONFLICTS 
Log Message:
Changed to tnftp


Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/ftp/lftp/CONFLICTS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CONFLICTS	21 Aug 2002 00:55:15 -0000	1.1.1.1
+++ CONFLICTS	23 Dec 2003 14:55:35 -0000	1.2
@@ -1 +1 @@
-conflicts lukemftp
+conflicts tnftp