[pkgsrc/trunk]: pkgsrc/doc Fix merge

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/282c42f2a61a
branches:  trunk
changeset: 418097:282c42f2a61a
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Wed Nov 20 17:04:56 2019 +0000

description:
Fix merge

diffstat:

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

diffs (20 lines):

diff -r 0ba681eff581 -r 282c42f2a61a doc/CHANGES-2019
--- a/doc/CHANGES-2019  Wed Nov 20 17:03:26 2019 +0000
+++ b/doc/CHANGES-2019  Wed Nov 20 17:04:56 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.5051 2019/11/20 17:03:26 kamil Exp $
+$NetBSD: CHANGES-2019,v 1.5052 2019/11/20 17:04:56 kamil Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -8138,9 +8138,5 @@
        Updated www/moodle to 3.8 [wen 2019-11-20]
        Updated www/nginx-devel to 1.17.6 [adam 2019-11-20]
        Updated www/nghttp2 to 1.40.0 [adam 2019-11-20]
-<<<<<<< CHANGES-2019
+       Updated sysutils/mc to 4.8.23 [nia 2019-11-20]
        Updated biology/openbabel to 3.0.0 [kamil 2019-11-20]
-=======
-       Updated sysutils/mc to 4.8.23 [nia 2019-11-20]
->>>>>>> 1.5050
-       Updated biology/openbabel to 3.0.0 [kamil 2019-11-20]