CVS commit: pkgsrc/doc

["Frank Kardel" <kardel%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kardel
Date:           Thu Dec 10 16:48:00 UTC 2020

Modified Files:
        pkgsrc/doc: CHANGES-2020

Log Message:
fix merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.6693 -r1.6694 pkgsrc/doc/CHANGES-2020

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2020
diff -u pkgsrc/doc/CHANGES-2020:1.6693 pkgsrc/doc/CHANGES-2020:1.6694
--- pkgsrc/doc/CHANGES-2020:1.6693      Thu Dec 10 16:45:07 2020
+++ pkgsrc/doc/CHANGES-2020     Thu Dec 10 16:47:59 2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.6693 2020/12/10 16:45:07 kardel Exp $
+$NetBSD: CHANGES-2020,v 1.6694 2020/12/10 16:47:59 kardel Exp $
 
 Changes to the packages collection and infrastructure in 2020:
 
@@ -9715,11 +9715,7 @@ Changes to the packages collection and i
        Updated devel/py-distorm3 to 3.5.1 [adam 2020-12-10]
        Updated audio/milkytracker to 1.03.00 [nia 2020-12-10]
        Updated comms/asterisk16 to 16.15.0 [gdt 2020-12-10]
-<<<<<<< CHANGES-2020
        Added devel/libyang version 1.0.184 [kardel 2020-12-10]
-=======
-       Added devel/libyang version 1.0.184 [root 2020-12-10]
        Updated games/rocksndiamonds to 4.2.0.5 [adam 2020-12-10]
        Updated databases/prometheus to 2.23.0 [adam 2020-12-10]
->>>>>>> 1.6692
        Added net/frr version 7.5 [kardel 2020-12-10]