CVS commit: pkgsrc/doc

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri May  3 09:56:50 UTC 2024

Modified Files:
        pkgsrc/doc: CHANGES-2024

Log Message:
CHANGES-2024: resolve a conflict


To generate a diff of this commit:
cvs rdiff -u -r1.3053 -r1.3054 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.3053 pkgsrc/doc/CHANGES-2024:1.3054
--- pkgsrc/doc/CHANGES-2024:1.3053      Fri May  3 09:56:16 2024
+++ pkgsrc/doc/CHANGES-2024     Fri May  3 09:56:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2024,v 1.3053 2024/05/03 09:56:16 pin Exp $
+$NetBSD: CHANGES-2024,v 1.3054 2024/05/03 09:56:50 pho Exp $
 
 Changes to the packages collection and infrastructure in 2024:
 
@@ -4893,10 +4893,6 @@ Changes to the packages collection and i
        Updated databases/hs-persistent-sqlite to 2.13.3.0 [pho 2024-05-03]
        Updated lang/hs-hslua to 2.3.1 [pho 2024-05-03]
        Updated devel/hs-pandoc-lua-marshal to 0.2.6 [pho 2024-05-03]
-<<<<<<< CHANGES-2024
-       Updated textproc/hs-texmath to 0.12.8.8 [pho 2024-05-03]
-=======
        Updated games/freedoom to 0.13.0 [micha 2024-05-03]
->>>>>>> 1.3051
        Updated textproc/hs-texmath to 0.12.8.8 [pho 2024-05-03]
        Updated devel/ast-grep to 0.21.3 [pin 2024-05-03]