[pkgsrc/trunk]: pkgsrc/doc Fix simultaneous commit

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b52729c6f5b
branches:  trunk
changeset: 450330:9b52729c6f5b
user:      pin <pin%pkgsrc.org@localhost>
date:      Wed Apr 14 11:47:53 2021 +0000

description:
Fix simultaneous commit

Simultaneous commit by myself and nia.
Fix doc/CHANGES-2021

diffstat:

 doc/CHANGES-2021 |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (20 lines):

diff -r f4df3cc1c80f -r 9b52729c6f5b doc/CHANGES-2021
--- a/doc/CHANGES-2021  Wed Apr 14 11:22:00 2021 +0000
+++ b/doc/CHANGES-2021  Wed Apr 14 11:47:53 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.2143 2021/04/14 11:22:00 pin Exp $
+$NetBSD: CHANGES-2021,v 1.2144 2021/04/14 11:47:53 pin Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -3424,9 +3424,5 @@
        Updated devel/py-typed-ast to 1.4.3 [adam 2021-04-14]
        Updated lang/vala to 0.52.1 [wiz 2021-04-14]
        Updated textproc/oniguruma to 6.9.7 [kim 2021-04-14]
-<<<<<<< CHANGES-2021
+       Updated multimedia/mlt to 6.26.1 [nia 2021-04-14]
        Updated www/hackernews-tui to 0.4.0 [pin 2021-04-14]
-=======
-       Updated multimedia/mlt to 6.26.1 [nia 2021-04-14]
->>>>>>> 1.2142
-       Updated www/hackernews-tui to 0.4.0 [pin 2021-04-14]