[pkgsrc/trunk]: pkgsrc/doc Removed CVS conflict markers from my last commit.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70a27bcf826c
branches:  trunk
changeset: 529458:70a27bcf826c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jun 05 05:58:56 2007 +0000

description:
Removed CVS conflict markers from my last commit.

diffstat:

 doc/CHANGES-2007 |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r f178eecc7c2a -r 70a27bcf826c doc/CHANGES-2007
--- a/doc/CHANGES-2007  Tue Jun 05 05:57:24 2007 +0000
+++ b/doc/CHANGES-2007  Tue Jun 05 05:58:56 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.1221 2007/06/05 05:56:53 rillig Exp $
+$NetBSD: CHANGES-2007,v 1.1222 2007/06/05 05:58:56 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -2344,9 +2344,6 @@
        Updated sysutils/htop to 0.6.6 [xtraeme 2007-06-03]
        Updated www/drraw to 2.2a4 [kleink 2007-06-03]
        Added graphics/rabbit version 0.5.2 [obache 2007-06-04]
-<<<<<<< CHANGES-2007
-       Added devel/p5-Class-Accessor-Chained version 0.01 [roland 2007-06-04]
-=======
        Updated mail/clamsmtp to 1.8nb2 [martti 2007-06-04]
        Updated x11/gdm to 2.18.1nb1 [jmmv 2007-06-04]
        Updated editors/nvi to 1.81.5nb4 [schmonz 2007-06-04]
@@ -2359,5 +2356,4 @@
        Removed devel/guile-oops [wiz 2007-06-05]
        Removed devel/guile14-gtk [wiz 2007-06-05]
        Removed lang/guile14 [wiz 2007-06-05]
->>>>>>> 1.1220
        Added devel/bouml version 2.27 [roland 2007-06-05]