CVS commit: pkgsrc/doc

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Sep 24 13:12:46 UTC 2025

Modified Files:
        pkgsrc/doc: CHANGES-2025

Log Message:
Fix garbled CHANGES-2025


To generate a diff of this commit:
cvs rdiff -u -r1.5712 -r1.5713 pkgsrc/doc/CHANGES-2025

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-2025
diff -u pkgsrc/doc/CHANGES-2025:1.5712 pkgsrc/doc/CHANGES-2025:1.5713
--- pkgsrc/doc/CHANGES-2025:1.5712      Wed Sep 24 12:50:39 2025
+++ pkgsrc/doc/CHANGES-2025     Wed Sep 24 13:12:46 2025
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2025,v 1.5712 2025/09/24 12:50:39 pin Exp $
+$NetBSD: CHANGES-2025,v 1.5713 2025/09/24 13:12:46 pin Exp $
 
 Changes to the packages collection and infrastructure in 2025:
 
@@ -8269,9 +8269,5 @@ Changes to the packages collection and i
        Updated devel/difftastic to 0.65.0 [pin 2025-09-24]
        Updated sysutils/eza to 0.23.3 [pin 2025-09-24]
        Updated devel/git-cliff to 2.10.1 [pin 2025-09-24]
-<<<<<<< CHANGES-2025
-       Updated graphics/feh to 3.11.2 [pin 2025-09-24]
-=======
        Updated devel/ruby-activestorage61 to 6.1.7.10nb1 [taca 2025-09-24]
->>>>>>> 1.5711
        Updated graphics/feh to 3.11.2 [pin 2025-09-24]