[pkgsrc/trunk]: pkgsrc/doc CHANGES-2022: Resolve conflicts.

[vins <vins%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04758bc228fe
branches:  trunk
changeset: 390476:04758bc228fe
user:      vins <vins%pkgsrc.org@localhost>
date:      Mon Dec 19 21:06:40 2022 +0000

description:
CHANGES-2022: Resolve conflicts.

diffstat:

 doc/CHANGES-2022 |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (20 lines):

diff -r 10ebe5678af9 -r 04758bc228fe doc/CHANGES-2022
--- a/doc/CHANGES-2022  Mon Dec 19 21:02:03 2022 +0000
+++ b/doc/CHANGES-2022  Mon Dec 19 21:06:40 2022 +0000
@@ -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 @@
        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
+       Added devel/syft version 0.63.0 [wiz 2022-12-19]
        Removed shells/osh successor shells/etsh [vins 2022-12-19]
-=======
-       Added devel/syft version 0.63.0 [wiz 2022-12-19]
->>>>>>> 1.6295
        Added x11/xmem version 1.29 [vins 2022-12-19]