CVS commit: pkgsrc/doc

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Wed Nov 20 17:04:56 UTC 2019

Modified Files:
        pkgsrc/doc: CHANGES-2019

Log Message:
Fix merge


To generate a diff of this commit:
cvs rdiff -u -r1.5051 -r1.5052 pkgsrc/doc/CHANGES-2019

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-2019
diff -u pkgsrc/doc/CHANGES-2019:1.5051 pkgsrc/doc/CHANGES-2019:1.5052
--- pkgsrc/doc/CHANGES-2019:1.5051      Wed Nov 20 17:03:26 2019
+++ pkgsrc/doc/CHANGES-2019     Wed Nov 20 17:04:56 2019
@@ -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 @@ Changes to the packages collection and i
        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 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]