OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 27-Nov-2003 15:12:12
Branch: HEAD Handle: 2003112714121000
Modified files:
openpkg-web news.txt
Log:
resolve cvs conflict
Summary:
Revision Changes Path
1.7575 +1 -5 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7574 -r1.7575 news.txt
--- openpkg-web/news.txt 27 Nov 2003 14:10:36 -0000 1.7574
+++ openpkg-web/news.txt 27 Nov 2003 14:12:10 -0000 1.7575
@@ -7,13 +7,9 @@
27-Nov-2003: Upgraded package: P<nagios-1.1-20031127>
27-Nov-2003: Upgraded package: P<rdist-7.0.0a10-20031127>
27-Nov-2003: Upgraded package: P<cvsd-1.0.0-20031127>
-<<<<<<< news.txt
-27-Nov-2003: Upgraded package: P<bs-0.98c8-20031127>
-=======
27-Nov-2003: Upgraded package: P<kerberos-1.3.1-20031127>
27-Nov-2003: Upgraded package: P<msntp-1.6-20031127>
27-Nov-2003: Upgraded package: P<bs-0.98c8-20031127>
->>>>>>> 1.7567
27-Nov-2003: Upgraded package: P<jabberd-1.4.2-20031127>
27-Nov-2003: Upgraded package: P<dss-5.0-20031127>
27-Nov-2003: Upgraded package: P<imapd-2.1.16-20031127>
@@ -44,7 +40,7 @@
26-Nov-2003: Upgraded package: P<apache-1.3.29-20031126>
25-Nov-2003: Upgraded package: P<xmlrpcpp-0.7-20031125>
25-Nov-2003: Upgraded package: P<xmlrpc++-0.7-20031125>
-25-Nov-2003: New package: P<xmlrpc++-0.7-20031125>
+25-Nov-2003: New package: P<xmlrpcpp-0.7-20031125>
25-Nov-2003: New package: P<lwc-1.0-20031125>
25-Nov-2003: Upgraded package: P<rt-3.0.7-20031125>
25-Nov-2003: Upgraded package: P<openssh-3.7.1p2-20031125>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
