Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=JsE2B6M/; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=wkZSS/tO Received: by mail.netbsd.org (Postfix, from userid 605) id 734D58503C; Fri, 3 May 2024 09:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1714730343; bh=l/cYBbOnHKA685gqo9IWQTN0h+Bb+w2leZbPocVMTH4=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=JsE2B6M/frH3FJTW/tzc8xsu/qZ3pbh234ZjB4dvD8xRC3QNJvYGC3PVd6b2waFRj Y8sv7UYBuszkMytqnHfTP3o8o7iaxO3tTodR6N0qKClns7684ZE29XgETfFV9UcBdt djKbhfIuZbpVzIRXMz8PRWNY05fhJX/o6i/NJy+M= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0068685024 for ; Fri, 3 May 2024 09:59:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=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 XUB_qrvP7nC9 for ; Fri, 3 May 2024 09:58:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4FB8584D14 for ; Fri, 3 May 2024 09:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1714730339; bh=l/cYBbOnHKA685gqo9IWQTN0h+Bb+w2leZbPocVMTH4=; h=Date:From:Subject:To:Reply-To; b=wkZSS/tOlFsvL6SYmswd3SZ0VJJF2xr3gqwmpX1bI4+NfWjNkMmXQ1/kMOax9rWk/ FWsGUsSbWsvU6supHuQ4L4EVO/uHvlXb/bc5cXd5982A+7hRhgpvNME1FCd7dUeJLU vpl1ucHIYZcd/mXDAmVKWOKBI0X0XFB1WmR3OjfE= Received: by cvs.NetBSD.org (Postfix, from userid 500) id DAEE4FA2F; Fri, 3 May 2024 09:56:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_171473021030700" MIME-Version: 1.0 Date: Fri, 3 May 2024 09:56:50 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/doc To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20240503095650.DAEE4FA2F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_171473021030700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_171473021030700 Content-Disposition: inline Content-Length: 959 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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] --_----------=_171473021030700--