[pkgsrc/trunk]: pkgsrc/doc Fix garbage commit containing conflicts

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b240af2fda21
branches:  trunk
changeset: 486184:b240af2fda21
user:      manu <manu%pkgsrc.org@localhost>
date:      Fri Dec 24 17:01:40 2004 +0000

description:
Fix garbage commit containing conflicts

diffstat:

 doc/CHANGES |  14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diffs (49 lines):

diff -r aed80616a88b -r b240af2fda21 doc/CHANGES
--- a/doc/CHANGES       Fri Dec 24 16:51:33 2004 +0000
+++ b/doc/CHANGES       Fri Dec 24 17:01:40 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8422 2004/12/24 16:53:52 manu Exp $
+$NetBSD: CHANGES,v 1.8423 2004/12/24 17:01:40 manu Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3602,9 +3602,6 @@
        Updated gift to 0.11.6nb1 [recht 2004-07-27]
        Updated gift-openft to 0.2.1.3 [recht 2004-07-27]
        Added miniSAPserver-0.2.4 [manu 2004-07-27]
-<<<<<<< CHANGES
-       Updated vlc to 0.7.2nb1 [manu 2004-07-27]
-=======
        Updated automake to 1.8.5 [wiz 2004-07-27]
        Updated cpuflags to 0.73 [abs 2004-07-27]
        Updated hpack to 0.79nb1 [minskim 2004-07-27]
@@ -3735,9 +3732,6 @@
        Updated xchat to 2.0.10nb1 [minskim 2004-08-04]
        Updated un-ttf to 20040804 [minskim 2004-08-04]
        Added p5-Text-WikiFormat-0.72 [cube 2004-08-04]
-<<<<<<< CHANGES
->>>>>>> 1.6802
-=======
        Updated getmail to 4.0.6 [schmonz 2004-08-05]
        Updated expat to 1.95.8 [recht 2004-08-05]
        Updated fontconfig to 2.2.96 [recht 2004-08-05]
@@ -4212,9 +4206,6 @@
        Updated lame to 3.96.1 [adam 2004-09-06]
        Updated ImageMagick to 6.0.7-1 [adam 2004-09-06]
        Updated kdelibs3 to 3.3.0nb1 [markd 2004-09-06]
-<<<<<<< CHANGES
->>>>>>> 1.7108
-=======
        Added ftplibpp-1.0.1 [cjep 2004-09-06]
        bsd.pkg.mk: started freeze for pkgsrc-2004Q3 branch [agc 2004-09-06]
        Updated fox to 1.0.43nb3 [wiz 2004-09-06]
@@ -6442,9 +6433,6 @@
        Updated p5-gtk to 0.7009nb2 [grant 2004-12-20]
        Updated p5-gtk2 to 1.042nb2 [grant 2004-12-20]
        Updated perl58 to 5.8.5nb6 [grant 2004-12-20]
-<<<<<<< CHANGES
->>>>>>> 1.8371
-=======
        Updated a2ps to 4.13.0.2nb5 [wiz 2004-12-20]
        bsd.pkg.mk: freeze ended for pkgsrc-2004Q4 branch [agc 2004-12-20]
        Updated firefox-bin-flash to 7.0r25 [xtraeme 2004-12-20]