CVS commit: pkgsrc/doc

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Sun Jan  3 10:51:31 UTC 2021

Modified Files:
        pkgsrc/doc: CHANGES-2021

Log Message:
 Updated math/R-SparseM to 1.78


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/doc/CHANGES-2021

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-2021
diff -u pkgsrc/doc/CHANGES-2021:1.100 pkgsrc/doc/CHANGES-2021:1.101
--- pkgsrc/doc/CHANGES-2021:1.100       Sun Jan  3 10:49:46 2021
+++ pkgsrc/doc/CHANGES-2021     Sun Jan  3 10:51:31 2021
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.100 2021/01/03 10:49:46 mef Exp $
+$NetBSD: CHANGES-2021,v 1.101 2021/01/03 10:51:31 mef Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -116,11 +116,7 @@ Changes to the packages collection and i
        Updated math/R-RcppEigen to 0.3.3.9.1 [mef 2021-01-03]
        Updated textproc/py-xmlschema to 1.4.1 [adam 2021-01-03]
        Updated www/py-uvicorn to 0.13.3 [adam 2021-01-03]
-<<<<<<< CHANGES-2021
        Updated converters/bdf2psf to 1.200 [fcambus 2021-01-03]
-=======
        Updated security/py-gssapi to 1.6.12 [adam 2021-01-03]
        Updated security/py-asyncssh to 2.5.0 [adam 2021-01-03]
->>>>>>> 1.98
-       Updated converters/bdf2psf to 1.200 [fcambus 2021-01-03]
        Updated math/R-SparseM to 1.78 [mef 2021-01-03]