[pkgsrc/trunk]: pkgsrc/doc cleanup accidental merge artifact

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a94bcb694bf0
branches:  trunk
changeset: 381838:a94bcb694bf0
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Thu Jul 14 05:20:06 2022 +0000

description:
cleanup accidental merge artifact

diffstat:

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

diffs (17 lines):

diff -r 2c4bb8e337ac -r a94bcb694bf0 doc/CHANGES-2022
--- a/doc/CHANGES-2022  Thu Jul 14 05:09:46 2022 +0000
+++ b/doc/CHANGES-2022  Thu Jul 14 05:20:06 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.3372 2022/07/14 05:09:46 dbj Exp $
+$NetBSD: CHANGES-2022,v 1.3373 2022/07/14 05:20:06 dbj Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -4808,7 +4808,6 @@
        Added audio/snapcast version 0.26.0 [nia 2022-07-03]
        Updated print/poppler to 22.06.0 [wiz 2022-07-03]
        Updated devel/py-mercurial to 6.1.4 [wiz 2022-07-03]
-<<<<<<< HEAD
        Added x11/qt5-styleplugins version 5.0.0.20170112 [pin 2022-07-03]
        Added shells/ksh93 version 1.0.0.2 [pin 2022-07-03]
        Added x11/xbrightness version 0.3 [pin 2022-07-03]