diff options
| author | rillig <rillig> | 2007-06-05 05:58:56 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-06-05 05:58:56 +0000 |
| commit | f26047944b243f70566d6cacd1f9183383ef5395 (patch) | |
| tree | 0c82601bfd03900fcf17cd38e6d8ae3992486ae7 | |
| parent | 596a68014c52d2b84316b43a775da20ff85e3c92 (diff) | |
| download | pkgsrc-f26047944b243f70566d6cacd1f9183383ef5395.tar.gz | |
Removed CVS conflict markers from my last commit.
| -rw-r--r-- | doc/CHANGES-2007 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007 index ae293499210..109495de9d9 100644 --- a/doc/CHANGES-2007 +++ b/doc/CHANGES-2007 @@ -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 @@ Changes to the packages collection and infrastructure in 2007: 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 @@ Changes to the packages collection and infrastructure in 2007: 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] |