Received: by mail.netbsd.org (Postfix, from userid 605) id E36BD84D6D; Mon, 7 Jun 2021 01:18:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 29E5884D43 for ; Mon, 7 Jun 2021 01:18:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id fAQs80GuvFsv for ; Mon, 7 Jun 2021 01:18:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7A0B684C71 for ; Mon, 7 Jun 2021 01:18:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6D505FA95; Mon, 7 Jun 2021 01:18:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1623028732194910" MIME-Version: 1.0 Date: Mon, 7 Jun 2021 01:18:52 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/doc To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20210607011852.6D505FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1623028732194910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Mon Jun 7 01:18:52 UTC 2021 Modified Files: pkgsrc/doc: CHANGES-2021 Log Message: remove conflict indicators To generate a diff of this commit: cvs rdiff -u -r1.3288 -r1.3289 pkgsrc/doc/CHANGES-2021 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1623028732194910 Content-Disposition: inline Content-Length: 1298 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/doc/CHANGES-2021 diff -u pkgsrc/doc/CHANGES-2021:1.3288 pkgsrc/doc/CHANGES-2021:1.3289 --- pkgsrc/doc/CHANGES-2021:1.3288 Mon Jun 7 01:15:54 2021 +++ pkgsrc/doc/CHANGES-2021 Mon Jun 7 01:18:52 2021 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2021,v 1.3288 2021/06/07 01:15:54 markd Exp $ +$NetBSD: CHANGES-2021,v 1.3289 2021/06/07 01:18:52 markd Exp $ Changes to the packages collection and infrastructure in 2021: @@ -5167,9 +5167,7 @@ Changes to the packages collection and i Updated devel/tig to 2.5.4 [fcambus 2021-06-06] Added devel/py-ijson version 3.1.4 [js 2021-06-06] Updated pkgtools/pkglint to 21.1.4 [rillig 2021-06-06] -<<<<<<< CHANGES-2021 Updated math/R-units to 0.7.1 [mef 2021-06-06] -======= Updated devel/R-diffobj to 0.3.4 [mef 2021-06-06] Updated devel/tex-l3backend to 2021 [markd 2021-06-06] Updated devel/tex-l3backend-doc to 2021 [markd 2021-06-06] @@ -5211,7 +5209,6 @@ Changes to the packages collection and i Updated lang/janet to 1.16.0 [nia 2021-06-06] Updated math/R-forcats to 0.5.1 [mef 2021-06-06] Updated devel/R-waldo to 0.2.5 [mef 2021-06-06] ->>>>>>> 1.3274 Updated geography/R-sf to 0.9.8 [mef 2021-06-06] Updated graphics/R-ggplot2 to 3.3.3 [mef 2021-06-06] Updated math/R-zoo to 1.8.9 [mef 2021-06-06] --_----------=_1623028732194910--