Received: by mail.netbsd.org (Postfix, from userid 605) id 484D384FDF; Sun, 4 Feb 2024 21:35:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7821284FDD for ; Sun, 4 Feb 2024 21:35:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id QxfTv81ks76n for ; Sun, 4 Feb 2024 21:35:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EF2D784D5E for ; Sun, 4 Feb 2024 21:35:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E933DFA42; Sun, 4 Feb 2024 21:35:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1707082501223580" MIME-Version: 1.0 Date: Sun, 4 Feb 2024 21:35:01 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/doc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20240204213501.E933DFA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1707082501223580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Feb 4 21:35:01 UTC 2024 Modified Files: pkgsrc/doc: TODO Log Message: doc: TODO: fix conflicts To generate a diff of this commit: cvs rdiff -u -r1.23986 -r1.23987 pkgsrc/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1707082501223580 Content-Disposition: inline Content-Length: 642 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/doc/TODO diff -u pkgsrc/doc/TODO:1.23986 pkgsrc/doc/TODO:1.23987 --- pkgsrc/doc/TODO:1.23986 Sun Feb 4 21:34:42 2024 +++ pkgsrc/doc/TODO Sun Feb 4 21:35:01 2024 @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.23986 2024/02/04 21:34:42 wiz Exp $ +$NetBSD: TODO,v 1.23987 2024/02/04 21:35:01 wiz Exp $ Suggested new packages ====================== @@ -1313,10 +1313,6 @@ For possible Perl packages updates, see o stgit-2.2.3 [pkg/57417] o tree-sitter-typescript-0.20.4 o xkbcomp-1.4.7 -<<<<<<< TODO - o stow-2.3.1 [pkg/57899] -======= ->>>>>>> 1.23985 o strace-4.23 o stratagus-2.2.5.5 o streamtuner-2.2.0 --_----------=_1707082501223580--