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: 13-Jan-2003 09:27:47
Branch: HEAD Handle: 2003011308274700
Modified files:
openpkg-web news.txt
Log:
Fix conflicts from concurrent development Michael and Ralf.
Summary:
Revision Changes Path
1.2679 +0 -3 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2678 -r1.2679 news.txt
--- openpkg-web/news.txt 13 Jan 2003 08:26:51 -0000 1.2678
+++ openpkg-web/news.txt 13 Jan 2003 08:27:47 -0000 1.2679
@@ -1,9 +1,6 @@
13-Jan-2003: Upgraded package: P<vim-6.1.288-20030113>
-<<<<<<< news.txt
13-Jan-2003: Upgraded package: P<docbook-4.2-20030113>
-=======
13-Jan-2003: Upgraded package: P<sdl-1.2.5-20030113>
->>>>>>> 1.2677
13-Jan-2003: Upgraded package: P<di-3.8-20030113>
13-Jan-2003: Upgraded package: P<rt-2.0.15-20030113>
12-Jan-2003: Upgraded package: P<stunnel-4.04-20030112>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
