CVS commit: pkgsrc/doc

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Feb 11 09:29:59 UTC 2022

Modified Files:
        pkgsrc/doc: CHANGES-2022

Log Message:
Resolve a conflict


To generate a diff of this commit:
cvs rdiff -u -r1.690 -r1.691 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.690 pkgsrc/doc/CHANGES-2022:1.691
--- pkgsrc/doc/CHANGES-2022:1.690       Fri Feb 11 09:29:12 2022
+++ pkgsrc/doc/CHANGES-2022     Fri Feb 11 09:29:59 2022
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.690 2022/02/11 09:29:12 pho Exp $
+$NetBSD: CHANGES-2022,v 1.691 2022/02/11 09:29:59 pho Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -941,9 +941,5 @@ Changes to the packages collection and i
        Updated devel/hs-cereal to 0.5.8.2 [pho 2022-02-11]
        Updated devel/hs-call-stack to 0.4.0 [pho 2022-02-11]
        Updated devel/hs-blaze-builder to 0.4.2.2 [pho 2022-02-11]
-<<<<<<< CHANGES-2022
        Updated devel/hs-basement to 0.0.12 [pho 2022-02-11]
-=======
        Updated net/unbound to 1.15.0nb1 [he 2022-02-11]
->>>>>>> 1.689
-       Updated devel/hs-basement to 0.0.12 [pho 2022-02-11]