[pkgsrc/trunk]: pkgsrc/doc Resolved conflicts.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/13e76cf895b1
branches:  trunk
changeset: 396538:13e76cf895b1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 26 21:28:45 2009 +0000

description:
Resolved conflicts.

diffstat:

 doc/CHANGES-2009 |  11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diffs (24 lines):

diff -r a69fc012a789 -r 13e76cf895b1 doc/CHANGES-2009
--- a/doc/CHANGES-2009  Sun Jul 26 21:28:01 2009 +0000
+++ b/doc/CHANGES-2009  Sun Jul 26 21:28:45 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.2849 2009/07/26 21:28:01 rillig Exp $
+$NetBSD: CHANGES-2009,v 1.2850 2009/07/26 21:28:45 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -3776,14 +3776,5 @@
        Updated archivers/zziplib to 0.13.56 [minskim 2009-07-26]
        Updated www/php-eaccelerator to 0.9.5.3 [jdolecek 2009-07-26]
        Added lang/LuaJIT version 1.1.5 [rillig 2009-07-26]
-<<<<<<< CHANGES-2009
-       Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26]
-       Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26]
-       Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26]
-       Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26]
-       Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26]
-       Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26]
-=======
        Updated archivers/php-zip to 5.2.10.1.0nb1 [minskim 2009-07-26]
->>>>>>> 1.2848
        Added shells/dash version 0.5.5.1 [rillig 2009-07-26]