OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 16-Jan-2004 10:43:39
Branch: HEAD Handle: 2004011609433700
Modified files:
openpkg-web news.txt
Log:
remove CVS collisions
Summary:
Revision Changes Path
1.8092 +0 -17 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8091 -r1.8092 news.txt
--- openpkg-web/news.txt 15 Jan 2004 19:30:52 -0000 1.8091
+++ openpkg-web/news.txt 16 Jan 2004 09:43:37 -0000 1.8092
@@ -226,14 +226,9 @@
23-Dec-2003: Upgraded package: P<gocr-0.38-20031223>
23-Dec-2003: Upgraded package: P<lftp-2.6.11-20031223>
23-Dec-2003: Upgraded package: P<epm-3.7-20031223>
-<<<<<<< news.txt
-23-Dec-2003: Upgraded package: P<fm-submit-0.0.5-20031223>
-23-Dec-2003: Upgraded package: P<ondir-0.2.2-20031223>
-=======
23-Dec-2003: Upgraded package: P<tre-0.6.3-20031223>
23-Dec-2003: Upgraded package: P<fm-submit-0.0.5-20031223>
23-Dec-2003: Upgraded package: P<ondir-0.2.2-20031223>
->>>>>>> 1.7869
23-Dec-2003: Upgraded package: P<gqview-1.3.7-20031223>
23-Dec-2003: Upgraded package: P<hexcurse-1.55-20031223>
23-Dec-2003: Upgraded package: P<pv-0.6.3-20031223>
@@ -282,12 +277,8 @@
19-Dec-2003: Upgraded package: P<gnutls-1.0.2-20031219>
19-Dec-2003: Upgraded package: P<lame-3.94b-20031219>
19-Dec-2003: Upgraded package: P<python-2.3.3-20031219>
-<<<<<<< news.txt
-19-Dec-2003: Upgraded package: P<rt-3.0.7-20031219>
-=======
19-Dec-2003: Upgraded package: P<perl-util-20031219-20031219>
19-Dec-2003: Upgraded package: P<rt-3.0.7-20031219>
->>>>>>> 1.7820
18-Dec-2003: Upgraded package: P<oracle-20031218-20031218>
18-Dec-2003: New package: P<oracle-barebone-9.2.0.1-20031218>
18-Dec-2003: Upgraded package: P<sleuthkit-1.66-20031218>
@@ -298,12 +289,8 @@
18-Dec-2003: Upgraded package: P<gettext-0.13.1-20031218>
18-Dec-2003: Upgraded package: P<powerdns-2.9.13-20031218>
18-Dec-2003: Upgraded package: P<sqlite-2.8.8-20031218>
-<<<<<<< news.txt
-18-Dec-2003: Upgraded package: P<uvscan-4.24+4309-20031218>
-=======
18-Dec-2003: Upgraded package: P<perl-mail-20031218-20031218>
18-Dec-2003: Upgraded package: P<uvscan-4.24+4309-20031218>
->>>>>>> 1.7808
18-Dec-2003: Upgraded package: P<zsh-4.0.8-20031218>
18-Dec-2003: Upgraded package: P<bogofilter-0.15.11-20031218>
18-Dec-2003: Upgraded package: P<top-3.5b12.10-20031218>
@@ -501,12 +488,8 @@
30-Nov-2003: Upgraded package: P<elm-2.4.109S-20031130>
30-Nov-2003: Upgraded package: P<apt-0.5.15.3-20031130>
30-Nov-2003: Upgraded package: P<ncurses-5.3.20031129-20031130>
-<<<<<<< news.txt
-30-Nov-2003: Upgraded package: P<postfix-2.0.16-20031130>
-=======
30-Nov-2003: Upgraded package: P<lesstif-0.93.94-20031130>
30-Nov-2003: Upgraded package: P<postfix-2.0.16-20031130>
->>>>>>> 1.7619
30-Nov-2003: Upgraded package: P<delegate-8.7.8-20031130>
30-Nov-2003: Upgraded package: P<perl-gtk-20031130-20031130>
29-Nov-2003: Upgraded package: P<apt-0.5.15.3-20031129>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
