OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 19-Aug-2002 10:11:18
Branch: HEAD Handle: 2002081909111800
Modified files:
openpkg-web news.txt
Log:
Fixed CVS conflict indicators.
Summary:
Revision Changes Path
1.1224 +0 -8 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1223 -r1.1224 news.txt
--- openpkg-web/news.txt 19 Aug 2002 08:09:25 -0000 1.1223
+++ openpkg-web/news.txt 19 Aug 2002 08:11:18 -0000 1.1224
@@ -1,11 +1,4 @@
-19-Aug-2002: Upgraded package: P<graphviz-1.8.9-20020819>
19-Aug-2002: Upgraded package: P<sendmail-8.12.5-20020819>
-<<<<<<< news.txt
-12-Aug-2002: Upgraded package: P<xv-3.10a-20020812>
-12-Aug-2002: Upgraded package: P<exim-4.10-20020812>
-12-Aug-2002: Upgraded package: P<postfix-1.1.11-20020810>
-12-Aug-2002: Upgraded package: P<sendmail-8.12.5-20020812>
-=======
18-Aug-2002: Upgraded package: P<vim-6.1.158-20020818>
18-Aug-2002: Upgraded package: P<spambouncer-1.5.20020816-20020818>
18-Aug-2002: Upgraded package: P<ncurses-5.2.20020817-20020818>
@@ -56,7 +49,6 @@
13-Aug-2002: Upgraded package: P<sqlite-2.6.3-20020813>
13-Aug-2002: Upgraded package: P<postfix-1.1.11-20020813>
13-Aug-2002: Upgraded package: P<geoip-1.0.0-20020813>
->>>>>>> 1.1221
12-Aug-2002: Upgraded package: P<ssmtp-2.48-20020812>
12-Aug-2002: Upgraded package: P<imapd-2.1.5-20020812>
12-Aug-2002: Upgraded package: P<imapd-2.1.5-20020626>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
