CVS commit: pkgsrc/doc

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Dec 19 21:06:40 UTC 2022

Modified Files:
        pkgsrc/doc: CHANGES-2022

Log Message:
CHANGES-2022: Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.6296 -r1.6297 pkgsrc/doc/CHANGES-2022

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-2022
diff -u pkgsrc/doc/CHANGES-2022:1.6296 pkgsrc/doc/CHANGES-2022:1.6297
--- pkgsrc/doc/CHANGES-2022:1.6296      Mon Dec 19 21:02:03 2022
+++ pkgsrc/doc/CHANGES-2022     Mon Dec 19 21:06:40 2022
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.6296 2022/12/19 21:02:03 vins Exp $
+$NetBSD: CHANGES-2022,v 1.6297 2022/12/19 21:06:40 vins Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -9418,9 +9418,6 @@ Changes to the packages collection and i
        Added devel/libmd version 1.0.4 [vins 2022-12-19]
        Updated devel/libbsd to 0.11.7 [vins 2022-12-19]
        Added devel/got-portable version 0.79 [vins 2022-12-19]
-<<<<<<< CHANGES-2022
-       Removed shells/osh successor shells/etsh [vins 2022-12-19]
-=======
        Added devel/syft version 0.63.0 [wiz 2022-12-19]
->>>>>>> 1.6295
+       Removed shells/osh successor shells/etsh [vins 2022-12-19]
        Added x11/xmem version 1.29 [vins 2022-12-19]