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: 18-Dec-2002 16:28:00
Branch: HEAD Handle: 2002121815275900
Modified files:
openpkg-web news.txt
Log:
remove conflict indicators
Summary:
Revision Changes Path
1.2320 +0 -3 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2319 -r1.2320 news.txt
--- openpkg-web/news.txt 18 Dec 2002 15:26:15 -0000 1.2319
+++ openpkg-web/news.txt 18 Dec 2002 15:27:59 -0000 1.2320
@@ -1,9 +1,6 @@
18-Dec-2002: Upgraded package: P<openldap-2.1.9-20021218>
-<<<<<<< news.txt
18-Dec-2002: Upgraded package: P<as-gui-0.5.7-20021218>
-=======
18-Dec-2002: Upgraded package: P<as-cui-0.5.4-20021218>
->>>>>>> 1.2318
18-Dec-2002: Upgraded package: P<as-cui-0.5.2-20021218>
18-Dec-2002: New package: P<as-cui-0.5.1-20021218>
18-Dec-2002: Upgraded package: P<openpkg-tool-20021218-20021218>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
