[pkgsrc/trunk]: pkgsrc/doc Resolve a conflict

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f66b1fa7495a
branches:  trunk
changeset: 373346:f66b1fa7495a
user:      pho <pho%pkgsrc.org@localhost>
date:      Fri Feb 11 09:29:59 2022 +0000

description:
Resolve a conflict

diffstat:

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

diffs (19 lines):

diff -r 0ec3e27d65fd -r f66b1fa7495a doc/CHANGES-2022
--- a/doc/CHANGES-2022  Fri Feb 11 09:29:12 2022 +0000
+++ b/doc/CHANGES-2022  Fri Feb 11 09:29:59 2022 +0000
@@ -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 @@
        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]