CVS commit: pkgsrc/doc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

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.

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