CVS commit: pkgsrc/doc

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Mon Oct 21 13:56:19 UTC 2024

Modified Files:
        pkgsrc/doc: CHANGES-2024

Log Message:
fix conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.6409 -r1.6410 pkgsrc/doc/CHANGES-2024

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2024
diff -u pkgsrc/doc/CHANGES-2024:1.6409 pkgsrc/doc/CHANGES-2024:1.6410
--- pkgsrc/doc/CHANGES-2024:1.6409      Mon Oct 21 13:54:13 2024
+++ pkgsrc/doc/CHANGES-2024     Mon Oct 21 13:56:19 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2024,v 1.6409 2024/10/21 13:54:13 pin Exp $
+$NetBSD: CHANGES-2024,v 1.6410 2024/10/21 13:56:19 pin Exp $
 
 Changes to the packages collection and infrastructure in 2024:
 
@@ -9668,10 +9668,6 @@ Changes to the packages collection and i
        Updated net/bind918 to 9.18.31 [taca 2024-10-21]
        Updated devel/ruby-contracts to 0.17.2 [taca 2024-10-21]
        Updated devel/ruby-io-event to 1.7.2 [taca 2024-10-21]
-<<<<<<< CHANGES-2024
-       Updated wm/leftwm to 0.5.3 [pin 2024-10-21]
-=======
        Updated devel/ruby-mixlib-shellout to 3.3.3 [taca 2024-10-21]
        Updated devel/ruby-rspec-core to 3.13.2 [taca 2024-10-21]
->>>>>>> 1.6408
        Updated wm/leftwm to 0.5.3 [pin 2024-10-21]