CVS commit: pkgsrc/doc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 29 19:31:38 UTC 2023

Modified Files:
        pkgsrc/doc: CHANGES-2023

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3383 -r1.3384 pkgsrc/doc/CHANGES-2023

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-2023
diff -u pkgsrc/doc/CHANGES-2023:1.3383 pkgsrc/doc/CHANGES-2023:1.3384
--- pkgsrc/doc/CHANGES-2023:1.3383      Mon May 29 19:31:02 2023
+++ pkgsrc/doc/CHANGES-2023     Mon May 29 19:31:38 2023
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2023,v 1.3383 2023/05/29 19:31:02 nia Exp $
+$NetBSD: CHANGES-2023,v 1.3384 2023/05/29 19:31:38 nia Exp $
 
 Changes to the packages collection and infrastructure in 2023:
 
@@ -4682,14 +4682,11 @@ Changes to the packages collection and i
        Updated devel/py-test-httpserver to 1.0.8 [adam 2023-05-29]
        Updated multimedia/openh264 to 2.3.1 [adam 2023-05-29]
        Updated devel/pkgconf to 1.9.5 [adam 2023-05-29]
-<<<<<<< CHANGES-2023
        Updated emulators/libretro-fbneo to 20230524 [nia 2023-05-29]
-=======
        Added textproc/p5-Number-Bytes-Human version 0.11 [gdt 2023-05-29]
        Updated devel/py-poetry-core to 1.6.1 [adam 2023-05-29]
        Updated devel/py-jaraco.functools to 3.7.0 [adam 2023-05-29]
        Updated net/rabbitmq to 3.11.16nb1 [wiz 2023-05-29]
        Updated devel/py-anyio to 3.7.0 [adam 2023-05-29]
        Updated devel/py-pydantic to 1.10.8 [adam 2023-05-29]
->>>>>>> 1.3382
        Added emulators/fbneo version 1.0.0.2 [nia 2023-05-29]