OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 08-Jul-2003 11:44:06
Branch: HEAD Handle: 2003070810440500
Modified files:
openpkg-web news.txt
Log:
remove markers
Summary:
Revision Changes Path
1.5437 +0 -6 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5436 -r1.5437 news.txt
--- openpkg-web/news.txt 8 Jul 2003 09:43:47 -0000 1.5436
+++ openpkg-web/news.txt 8 Jul 2003 09:44:05 -0000 1.5437
@@ -8,7 +8,6 @@
08-Jul-2003: Upgraded package: P<vrrpd-0.8.7-20030708>
08-Jul-2003: Upgraded package: P<tftp-0.34-20030708>
08-Jul-2003: Upgraded package: P<teapop-0.3.5-20030708>
-<<<<<<< news.txt
08-Jul-2003: Upgraded package: P<sysmon-0.91.19-20030708>
08-Jul-2003: Upgraded package: P<sudo-1.6.7p5-20030708>
08-Jul-2003: Upgraded package: P<stunnel-4.04-20030708>
@@ -63,7 +62,6 @@
08-Jul-2003: Upgraded package: P<arpd-0.2-20030708>
08-Jul-2003: Upgraded package: P<amavisd-20030616p2-20030708>
08-Jul-2003: Upgraded package: P<aide-0.9-20030708>
-<<<<<<< news.txt
07-Jul-2003: Upgraded package: P<pgp-6.5.8-20030707>
07-Jul-2003: Upgraded package: P<perl-www-20030707-20030707>
07-Jul-2003: Upgraded package: P<perl-conv-20030707-20030707>
@@ -77,14 +75,10 @@
07-Jul-2003: Upgraded package: P<gated-3.6-20030707>
07-Jul-2003: Upgraded package: P<docbook-4.2-20030707>
07-Jul-2003: Upgraded package: P<dia-0.91-20030707>
-=======
-=======
08-Jul-2003: Upgraded package: P<squirrelmail-1.4.1-20030708>
->>>>>>> 1.5431
08-Jul-2003: Upgraded package: P<imagemagick-5.5.7.10-20030708>
08-Jul-2003: Upgraded package: P<html2text-1.3.1-20030708>
08-Jul-2003: Upgraded package: P<perl-util-20030708-20030708>
->>>>>>> 1.5430
07-Jul-2003: Upgraded package: P<perl-util-20030705-20030707>
07-Jul-2003: Upgraded package: P<m4-1.4o-20030707>
07-Jul-2003: Upgraded package: P<cdk-4.9.10.20030418-20030707>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
