CVS commit: pkgsrc/doc

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Thu Jul 14 05:20:06 UTC 2022

Modified Files:
        pkgsrc/doc: CHANGES-2022

Log Message:
cleanup accidental merge artifact


To generate a diff of this commit:
cvs rdiff -u -r1.3372 -r1.3373 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.3372 pkgsrc/doc/CHANGES-2022:1.3373
--- pkgsrc/doc/CHANGES-2022:1.3372      Thu Jul 14 05:09:46 2022
+++ pkgsrc/doc/CHANGES-2022     Thu Jul 14 05:20:06 2022
@@ -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 @@ Changes to the packages collection and i
        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]