OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 19-Aug-2002 16:41:59
Branch: HEAD Handle: 2002081915415800
Modified files:
openpkg-web news.txt
Log:
fix merge errors
Summary:
Revision Changes Path
1.1240 +0 -3 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1239 -r1.1240 news.txt
--- openpkg-web/news.txt 19 Aug 2002 14:33:25 -0000 1.1239
+++ openpkg-web/news.txt 19 Aug 2002 14:41:58 -0000 1.1240
@@ -4,12 +4,9 @@
19-Aug-2002: Upgraded package: P<openldap-2.1.3-20020819>
19-Aug-2002: Upgraded package: P<libnet-1.1.0-20020819>
19-Aug-2002: Upgraded package: P<imagemagick-5.4.8.0-20020819>
-<<<<<<< news.txt
19-Aug-2002: Upgraded package: P<grep-2.5-20020819>
-=======
19-Aug-2002: Upgraded package: P<vim-6.1.158-20020819>
19-Aug-2002: Upgraded package: P<tetex-1.0.7-20020819>
->>>>>>> 1.1233
19-Aug-2002: Upgraded package: P<spegla-1.1p4-20020619>
19-Aug-2002: Upgraded package: P<pureftpd-1.1.0-20020819>
19-Aug-2002: Upgraded package: P<perl-dbi-20020819-20020819>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
