CVS commit: pkgsrc/doc

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Fri Oct 16 18:32:22 UTC 2026

Modified Files:
        pkgsrc/doc: CHANGES-2026

Log Message:
CHANGES-2026: fix merge conflict


To generate a diff of this commit:
cvs rdiff -u -r1.7024 -r1.7025 pkgsrc/doc/CHANGES-2026

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-2026
diff -u pkgsrc/doc/CHANGES-2026:1.7024 pkgsrc/doc/CHANGES-2026:1.7025
--- pkgsrc/doc/CHANGES-2026:1.7024      Fri Oct 16 18:30:11 2026
+++ pkgsrc/doc/CHANGES-2026     Fri Oct 16 18:32:22 2026
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2026,v 1.7024 2026/10/16 18:30:11 ktnb Exp $
+$NetBSD: CHANGES-2026,v 1.7025 2026/10/16 18:32:22 ktnb Exp $
 
 Changes to the packages collection and infrastructure in 2026:
 
@@ -10527,10 +10527,6 @@ Changes to the packages collection and i
        Updated devel/py-project-api to 1.11.7 [adam 2026-10-16]
        Updated net/py-python-socks to 3.1.1 [adam 2026-10-16]
        Updated textproc/py-numpydoc to 1.11.0 [adam 2026-10-16]
-<<<<<<< CHANGES-2026
-       Updated www/album to 4.18 [ktnb 2026-10-16]
-=======
        Updated security/py-cyclonedx-bom to 7.5.0 [adam 2026-10-16]
        Updated devel/py-argparse-manpage to 4.8 [adam 2026-10-16]
->>>>>>> 1.7023
        Updated www/album to 4.18 [ktnb 2026-10-16]