CVS commit: pkgsrc/doc

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Feb  3 12:21:18 UTC 2024

Modified Files:
        pkgsrc/doc: CHANGES-2024

Log Message:
(doc/CHANGES-2024) fix CONFLICT, sorry


To generate a diff of this commit:
cvs rdiff -u -r1.848 -r1.849 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.848 pkgsrc/doc/CHANGES-2024:1.849
--- pkgsrc/doc/CHANGES-2024:1.848       Sat Feb  3 12:03:26 2024
+++ pkgsrc/doc/CHANGES-2024     Sat Feb  3 12:21:18 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2024,v 1.848 2024/02/03 12:03:26 mef Exp $
+$NetBSD: CHANGES-2024,v 1.849 2024/02/03 12:21:18 mef Exp $
 
 Changes to the packages collection and infrastructure in 2024:
 
@@ -1179,9 +1179,6 @@ Changes to the packages collection and i
        Updated math/R-minqa to 1.2.6 [mef 2024-02-03]
        Updated math/R-mvtnorm to 1.2.4 [mef 2024-02-03]
        Updated math/R-ncdf4 to 1.22 [mef 2024-02-03]
-<<<<<<< CHANGES-2024
        Added math/R-itertools version 0.1.3 [mef 2024-02-03]
-=======
        Updated sysutils/stow to 2.3.1 [bsiegert 2024-02-03]
->>>>>>> 1.847
        Updated math/R-plyr to 1.8.9 [mef 2024-02-03]