CVS commit: pkgsrc/doc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Aug 27 11:25:09 UTC 2026

Modified Files:
        pkgsrc/doc: CHANGES-2026

Log Message:
remove conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.5577 -r1.5578 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.5577 pkgsrc/doc/CHANGES-2026:1.5578
--- pkgsrc/doc/CHANGES-2026:1.5577      Thu Aug 27 10:59:41 2026
+++ pkgsrc/doc/CHANGES-2026     Thu Aug 27 11:25:09 2026
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2026,v 1.5577 2026/08/27 10:59:41 drixter Exp $
+$NetBSD: CHANGES-2026,v 1.5578 2026/08/27 11:25:09 adam Exp $
 
 Changes to the packages collection and infrastructure in 2026:
 
@@ -8243,9 +8243,5 @@ Changes to the packages collection and i
        Updated print/hplip to 3.19.12nb39 [wiz 2026-08-27]
        Updated sysutils/fd-find to 10.5.0 [wiz 2026-08-27]
        Updated net/filezilla to 3.71.1 [wiz 2026-08-27]
-<<<<<<< CHANGES-2026
-       Added sysutils/leaves version 0.2.0 [drixter 2026-08-27]
-=======
        Updated geography/py-gnssutils to 1.2.7 [gdt 2026-08-27]
->>>>>>> 1.5576
        Added sysutils/leaves version 0.2.0 [drixter 2026-08-27]