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: 23-Jul-2003 15:12:21
Branch: HEAD Handle: 2003072314121900
Modified files:
openpkg-web news.txt
Log:
remove markers
Summary:
Revision Changes Path
1.5751 +0 -6 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5750 -r1.5751 news.txt
--- openpkg-web/news.txt 23 Jul 2003 13:11:53 -0000 1.5750
+++ openpkg-web/news.txt 23 Jul 2003 13:12:19 -0000 1.5751
@@ -6,7 +6,6 @@
23-Jul-2003: Upgraded package: P<ragel-1.5.4-20030723>
23-Jul-2003: Upgraded package: P<qt-3.1.2-20030723>
23-Jul-2003: Upgraded package: P<procmail-3.22-20030723>
-<<<<<<< news.txt
23-Jul-2003: Upgraded package: P<precc-2.51e-20030723>
23-Jul-2003: Upgraded package: P<postfix-2.0.13-20030723>
23-Jul-2003: Upgraded package: P<petidomo-4.0b1-20030723>
@@ -26,7 +25,6 @@
23-Jul-2003: Upgraded package: P<perforce-2003.1-20030723>
23-Jul-2003: Upgraded package: P<openssl-0.9.7b-20030723>
23-Jul-2003: Upgraded package: P<openpkg-20030723-20030723>
-<<<<<<< news.txt
23-Jul-2003: Upgraded package: P<openjade-1.3.2-20030723>
23-Jul-2003: Upgraded package: P<ntp-4.1.2-20030723>
23-Jul-2003: Upgraded package: P<noweb-2.10c-20030723>
@@ -77,12 +75,8 @@
23-Jul-2003: Upgraded package: P<apache-1.3.28-20030723>
23-Jul-2003: Upgraded package: P<acroread-5.07-20030723>
23-Jul-2003: Upgraded package: P<accent-0.8-20030723>
-=======
-=======
23-Jul-2003: Upgraded package: P<tftp-0.34-20030723>
->>>>>>> 1.5749
23-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030723>
->>>>>>> 1.5748
23-Jul-2003: Upgraded package: P<spamassassin-2.55-20030723>
23-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030723>
23-Jul-2003: Upgraded package: P<lmtp2nntp-1.2.0-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
