CVS commit: pkgsrc/doc

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Apr 29 04:01:25 UTC 2024

Modified Files:
        pkgsrc/doc: CHANGES-2024

Log Message:
Fix a race-condition happened to CHANGES-2024


To generate a diff of this commit:
cvs rdiff -u -r1.2829 -r1.2830 pkgsrc/doc/CHANGES-2024

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-2024
diff -u pkgsrc/doc/CHANGES-2024:1.2829 pkgsrc/doc/CHANGES-2024:1.2830
--- pkgsrc/doc/CHANGES-2024:1.2829      Mon Apr 29 04:00:22 2024
+++ pkgsrc/doc/CHANGES-2024     Mon Apr 29 04:01:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2024,v 1.2829 2024/04/29 04:00:22 pho Exp $
+$NetBSD: CHANGES-2024,v 1.2830 2024/04/29 04:01:25 pho Exp $
 
 Changes to the packages collection and infrastructure in 2024:
 
@@ -4637,9 +4637,7 @@ Changes to the packages collection and i
        Updated devel/hs-safe to 0.3.21 [pho 2024-04-29]
        Updated devel/hs-random to 1.2.1.2 [pho 2024-04-29]
        Updated devel/hs-file-embed to 0.0.16.0 [pho 2024-04-29]
-<<<<<<< CHANGES-2024
        Updated devel/MoarVM to 2024.04 [mef 2024-04-29]
-=======
        Updated devel/hs-th-abstraction to 0.7.0.0 [pho 2024-04-29]
        Added devel/hs-os-string version 2.0.2.1 [pho 2024-04-29]
        Updated devel/hs-hashable to 1.4.4.0 [pho 2024-04-29]
@@ -4647,6 +4645,5 @@ Changes to the packages collection and i
        Updated security/hs-digest to 0.0.2.1 [pho 2024-04-29]
        Updated archivers/hs-zlib to 0.7.1.0 [pho 2024-04-29]
        Updated archivers/hs-tar to 0.6.2.0 [pho 2024-04-29]
->>>>>>> 1.2827
        Updated lang/rakudo to 2024.04 [mef 2024-04-29]
        Updated lang/hs-hslua-core to 2.3.2 [pho 2024-04-29]