[pkgsrc/trunk]: pkgsrc/doc Fix CHANGES-2022

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/905c6a33ec2d
branches:  trunk
changeset: 388950:905c6a33ec2d
user:      pin <pin%pkgsrc.org@localhost>
date:      Mon Nov 28 09:56:20 2022 +0000

description:
Fix CHANGES-2022

diffstat:

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

diffs (20 lines):

diff -r 5a788b803522 -r 905c6a33ec2d doc/CHANGES-2022
--- a/doc/CHANGES-2022  Mon Nov 28 09:55:16 2022 +0000
+++ b/doc/CHANGES-2022  Mon Nov 28 09:56:20 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.5757 2022/11/28 09:55:16 pin Exp $
+$NetBSD: CHANGES-2022,v 1.5758 2022/11/28 09:56:20 pin Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -8705,10 +8705,6 @@
        Updated sysutils/py-stack-data to 0.6.2 [adam 2022-11-28]
        Updated chat/swirc to 3.3.8 [fcambus 2022-11-28]
        Updated sysutils/onefetch to 2.14.2 [pin 2022-11-28]
-<<<<<<< CHANGES-2022
-       Added biology/balance-tui version 0.1.0 [pin 2022-11-28]
-=======
        Updated devel/py-virtualenv to 20.17.0 [adam 2022-11-28]
        Updated devel/py-tubes to 0.2.1 [adam 2022-11-28]
->>>>>>> 1.5756
        Added biology/balance-tui version 0.1.0 [pin 2022-11-28]