Mon Jun 7 01:18:52 2021 UTC ()
remove conflict indicators


(markd)
diff -r1.3288 -r1.3289 pkgsrc/doc/CHANGES-2021
cvs diff -r1.3288 -r1.3289 pkgsrc/doc/CHANGES-2021 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2021 2021/06/07 01:15:54 1.3288
+++ pkgsrc/doc/CHANGES-2021 2021/06/07 01:18:52 1.3289
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2021,v 1.3288 2021/06/07 01:15:54 markd Exp $ 1$NetBSD: CHANGES-2021,v 1.3289 2021/06/07 01:18:52 markd Exp $
2 2
3Changes to the packages collection and infrastructure in 2021: 3Changes to the packages collection and infrastructure in 2021:
4 4
5 Updated devel/R-git2r to 0.27.1 [mef 2021-01-01] 5 Updated devel/R-git2r to 0.27.1 [mef 2021-01-01]
6 Updated devel/R-rlang to 0.4.9 [mef 2021-01-01] 6 Updated devel/R-rlang to 0.4.9 [mef 2021-01-01]
7 Updated devel/R-cli to 2.2.0 [mef 2021-01-01] 7 Updated devel/R-cli to 2.2.0 [mef 2021-01-01]
8 Updated devel/R-testthat to 3.0.1 [mef 2021-01-01] 8 Updated devel/R-testthat to 3.0.1 [mef 2021-01-01]
9 Updated net/mikutter to 4.1.3 [tsutsui 2021-01-01] 9 Updated net/mikutter to 4.1.3 [tsutsui 2021-01-01]
10 Added lang/R-cpp11 version 0.2.4 [mef 2021-01-01] 10 Added lang/R-cpp11 version 0.2.4 [mef 2021-01-01]
11 Updated devel/R-pkgbuild to 1.2.0 [mef 2021-01-01] 11 Updated devel/R-pkgbuild to 1.2.0 [mef 2021-01-01]
12 Added devel/R-gert version 1.0.2 [mef 2021-01-01] 12 Added devel/R-gert version 1.0.2 [mef 2021-01-01]
13 Added devel/R-rappdirs version 0.3.1 [mef 2021-01-01] 13 Added devel/R-rappdirs version 0.3.1 [mef 2021-01-01]
14 Added devel/R-testit version 0.12 [mef 2021-01-01] 14 Added devel/R-testit version 0.12 [mef 2021-01-01]
@@ -5157,29 +5157,27 @@ Changes to the packages collection and i @@ -5157,29 +5157,27 @@ Changes to the packages collection and i
5157 Added graphics/R-isoband version 0.2.4 [mef 2021-06-06] 5157 Added graphics/R-isoband version 0.2.4 [mef 2021-06-06]
5158 Updated security/php-gnupg to 1.5.0 [taca 2021-06-06] 5158 Updated security/php-gnupg to 1.5.0 [taca 2021-06-06]
5159 Updated math/R-mapproj to 1.2.7 [mef 2021-06-06] 5159 Updated math/R-mapproj to 1.2.7 [mef 2021-06-06]
5160 Updated pkgtools/pkglint to 21.1.3 [rillig 2021-06-06] 5160 Updated pkgtools/pkglint to 21.1.3 [rillig 2021-06-06]
5161 Updated geography/R-maptools to 1.1.1 [mef 2021-06-06] 5161 Updated geography/R-maptools to 1.1.1 [mef 2021-06-06]
5162 Added math/R-proxy version 0.4.25 [mef 2021-06-06] 5162 Added math/R-proxy version 0.4.25 [mef 2021-06-06]
5163 Updated print/ruby-pdf-reader to 2.5.0 [taca 2021-06-06] 5163 Updated print/ruby-pdf-reader to 2.5.0 [taca 2021-06-06]
5164 Updated net/youtube-dl to 20210606 [leot 2021-06-06] 5164 Updated net/youtube-dl to 20210606 [leot 2021-06-06]
5165 Updated textproc/ruby-kramdown-rfc2629 to 1.4.14 [taca 2021-06-06] 5165 Updated textproc/ruby-kramdown-rfc2629 to 1.4.14 [taca 2021-06-06]
5166 Updated chat/element-web to 1.7.29 [js 2021-06-06] 5166 Updated chat/element-web to 1.7.29 [js 2021-06-06]
5167 Updated devel/tig to 2.5.4 [fcambus 2021-06-06] 5167 Updated devel/tig to 2.5.4 [fcambus 2021-06-06]
5168 Added devel/py-ijson version 3.1.4 [js 2021-06-06] 5168 Added devel/py-ijson version 3.1.4 [js 2021-06-06]
5169 Updated pkgtools/pkglint to 21.1.4 [rillig 2021-06-06] 5169 Updated pkgtools/pkglint to 21.1.4 [rillig 2021-06-06]
5170<<<<<<< CHANGES-2021 
5171 Updated math/R-units to 0.7.1 [mef 2021-06-06] 5170 Updated math/R-units to 0.7.1 [mef 2021-06-06]
5172======= 
5173 Updated devel/R-diffobj to 0.3.4 [mef 2021-06-06] 5171 Updated devel/R-diffobj to 0.3.4 [mef 2021-06-06]
5174 Updated devel/tex-l3backend to 2021 [markd 2021-06-06] 5172 Updated devel/tex-l3backend to 2021 [markd 2021-06-06]
5175 Updated devel/tex-l3backend-doc to 2021 [markd 2021-06-06] 5173 Updated devel/tex-l3backend-doc to 2021 [markd 2021-06-06]
5176 Updated devel/tex-l3kernel to 2021 [markd 2021-06-06] 5174 Updated devel/tex-l3kernel to 2021 [markd 2021-06-06]
5177 Updated devel/tex-l3kernel-doc to 2021 [markd 2021-06-06] 5175 Updated devel/tex-l3kernel-doc to 2021 [markd 2021-06-06]
5178 Updated devel/tex-l3packages to 2021 [markd 2021-06-06] 5176 Updated devel/tex-l3packages to 2021 [markd 2021-06-06]
5179 Updated devel/tex-l3packages-doc to 2021 [markd 2021-06-06] 5177 Updated devel/tex-l3packages-doc to 2021 [markd 2021-06-06]
5180 Updated devel/tex-l3experimental to 2021 [markd 2021-06-06] 5178 Updated devel/tex-l3experimental to 2021 [markd 2021-06-06]
5181 Updated print/tex-luacolor to 1.17 [markd 2021-06-06] 5179 Updated print/tex-luacolor to 1.17 [markd 2021-06-06]
5182 Updated print/tex-luacolor-doc to 1.17 [markd 2021-06-06] 5180 Updated print/tex-luacolor-doc to 1.17 [markd 2021-06-06]
5183 Updated devel/tex-lualibs to 2.74 [markd 2021-06-06] 5181 Updated devel/tex-lualibs to 2.74 [markd 2021-06-06]
5184 Updated devel/tex-lualibs-doc to 2.74 [markd 2021-06-06] 5182 Updated devel/tex-lualibs-doc to 2.74 [markd 2021-06-06]
5185 Updated fonts/tex-luaotfload to 3.18 [markd 2021-06-06] 5183 Updated fonts/tex-luaotfload to 3.18 [markd 2021-06-06]
@@ -5201,27 +5199,26 @@ Changes to the packages collection and i @@ -5201,27 +5199,26 @@ Changes to the packages collection and i
5201 Updated print/tex-make4ht-doc to 0.3g [markd 2021-06-06] 5199 Updated print/tex-make4ht-doc to 0.3g [markd 2021-06-06]
5202 Updated print/tex-plain to 3.141592653.57963 [markd 2021-06-06] 5200 Updated print/tex-plain to 3.141592653.57963 [markd 2021-06-06]
5203 Updated devel/R-gert to 1.3.0 [mef 2021-06-06] 5201 Updated devel/R-gert to 1.3.0 [mef 2021-06-06]
5204 Updated print/tex-siunitx to 3.0.10 [markd 2021-06-06] 5202 Updated print/tex-siunitx to 3.0.10 [markd 2021-06-06]
5205 Updated print/tex-siunitx-doc to 3.0.10 [markd 2021-06-06] 5203 Updated print/tex-siunitx-doc to 3.0.10 [markd 2021-06-06]
5206 Updated devel/R-glue to 1.4.2 [mef 2021-06-06] 5204 Updated devel/R-glue to 1.4.2 [mef 2021-06-06]
5207 Updated devel/R-inline to 0.3.19 [mef 2021-06-06] 5205 Updated devel/R-inline to 0.3.19 [mef 2021-06-06]
5208 Updated devel/R-rappdirs to 0.3.3 [mef 2021-06-06] 5206 Updated devel/R-rappdirs to 0.3.3 [mef 2021-06-06]
5209 Updated devel/R-repr to 1.1.3 [mef 2021-06-06] 5207 Updated devel/R-repr to 1.1.3 [mef 2021-06-06]
5210 Updated devel/R-testthat to 3.0.2 [mef 2021-06-06] 5208 Updated devel/R-testthat to 3.0.2 [mef 2021-06-06]
5211 Updated lang/janet to 1.16.0 [nia 2021-06-06] 5209 Updated lang/janet to 1.16.0 [nia 2021-06-06]
5212 Updated math/R-forcats to 0.5.1 [mef 2021-06-06] 5210 Updated math/R-forcats to 0.5.1 [mef 2021-06-06]
5213 Updated devel/R-waldo to 0.2.5 [mef 2021-06-06] 5211 Updated devel/R-waldo to 0.2.5 [mef 2021-06-06]
5214>>>>>>> 1.3274 
5215 Updated geography/R-sf to 0.9.8 [mef 2021-06-06] 5212 Updated geography/R-sf to 0.9.8 [mef 2021-06-06]
5216 Updated graphics/R-ggplot2 to 3.3.3 [mef 2021-06-06] 5213 Updated graphics/R-ggplot2 to 3.3.3 [mef 2021-06-06]
5217 Updated math/R-zoo to 1.8.9 [mef 2021-06-06] 5214 Updated math/R-zoo to 1.8.9 [mef 2021-06-06]
5218 Updated math/R-xts to 0.12.1 [mef 2021-06-06] 5215 Updated math/R-xts to 0.12.1 [mef 2021-06-06]
5219 Updated devel/R-IRdisplay to 1.0 [mef 2021-06-06] 5216 Updated devel/R-IRdisplay to 1.0 [mef 2021-06-06]
5220 Updated sysutils/xplr to 0.14.0 [pin 2021-06-06] 5217 Updated sysutils/xplr to 0.14.0 [pin 2021-06-06]
5221 Updated sysutils/macchina to 0.9.1 [pin 2021-06-06] 5218 Updated sysutils/macchina to 0.9.1 [pin 2021-06-06]
5222 Updated games/manaplus to 2.1.3.17 [nia 2021-06-06] 5219 Updated games/manaplus to 2.1.3.17 [nia 2021-06-06]
5223 Updated games/gemrb to 0.8.8 [nia 2021-06-06] 5220 Updated games/gemrb to 0.8.8 [nia 2021-06-06]
5224 Updated x11/libX11 to 1.7.2 [wiz 2021-06-06] 5221 Updated x11/libX11 to 1.7.2 [wiz 2021-06-06]
5225 Updated print/tex-koma-script to 3.33 [markd 2021-06-06] 5222 Updated print/tex-koma-script to 3.33 [markd 2021-06-06]
5226 Updated textproc/tex-lwarp to 0.898 [markd 2021-06-06] 5223 Updated textproc/tex-lwarp to 0.898 [markd 2021-06-06]
5227 Updated textproc/tex-lwarp-doc to 0.898 [markd 2021-06-06] 5224 Updated textproc/tex-lwarp-doc to 0.898 [markd 2021-06-06]