CVS commit: pkgsrc/doc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Mar 10 15:43:22 UTC 2025

Modified Files:
        pkgsrc/doc: CHANGES-2025

Log Message:
doc: fix merge error


To generate a diff of this commit:
cvs rdiff -u -r1.2178 -r1.2179 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.2178 pkgsrc/doc/CHANGES-2025:1.2179
--- pkgsrc/doc/CHANGES-2025:1.2178      Mon Mar 10 15:42:57 2025
+++ pkgsrc/doc/CHANGES-2025     Mon Mar 10 15:43:22 2025
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2025,v 1.2178 2025/03/10 15:42:57 wiz Exp $
+$NetBSD: CHANGES-2025,v 1.2179 2025/03/10 15:43:22 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2025:
 
@@ -2784,10 +2784,7 @@ Changes to the packages collection and i
        Updated sysutils/flashprog to 1.4 [jakllsch 2025-03-10]
        Updated devel/jj to 0.27.0 [wiz 2025-03-10]
        Updated sysutils/fclones to 0.35.0 [wiz 2025-03-10]
-<<<<<<< CHANGES-2025
        Updated security/keepassxc to 2.7.10 [wiz 2025-03-10]
-=======
        Updated graphics/argyllcms to 3.3.0 [jakllsch 2025-03-10]
->>>>>>> 1.2176
        Updated x11/dunst to 1.12.2 [wiz 2025-03-10]
        Updated audio/faad2 to 2.11.2 [wiz 2025-03-10]