CVS commit: pkgsrc/doc

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Apr 23 12:31:25 UTC 2020

Modified Files:
        pkgsrc/doc: CHANGES-2020

Log Message:
Properly added net/ocamlnet to CHANGES


To generate a diff of this commit:
cvs rdiff -u -r1.2478 -r1.2479 pkgsrc/doc/CHANGES-2020

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-2020
diff -u pkgsrc/doc/CHANGES-2020:1.2478 pkgsrc/doc/CHANGES-2020:1.2479
--- pkgsrc/doc/CHANGES-2020:1.2478      Thu Apr 23 12:29:06 2020
+++ pkgsrc/doc/CHANGES-2020     Thu Apr 23 12:31:25 2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.2478 2020/04/23 12:29:06 jaapb Exp $
+$NetBSD: CHANGES-2020,v 1.2479 2020/04/23 12:31:25 jaapb Exp $
 
 Changes to the packages collection and infrastructure in 2020:
 
@@ -3361,9 +3361,7 @@ Changes to the packages collection and i
        Updated www/eliom to 6.11.0 [jaapb 2020-04-21]
        Updated www/ocsigen-toolkit to 2.5.0 [jaapb 2020-04-21]
        Updated www/ocsigen-i18n to 3.5.0 [jaapb 2020-04-21]
-<<<<<<< CHANGES-2020
        Updated www/ocsigen-start to 2.16.1 [jaapb 2020-04-21]
-=======
        Added audio/pragha version 1.3.4 [nia 2020-04-21]
        Updated security/openssl to 1.1.1g [sevan 2020-04-21]
        Updated net/cacti to 1.2.7 [mef 2020-04-21]
@@ -3407,5 +3405,4 @@ Changes to the packages collection and i
        Updated net/libtorrent-rasterbar to 1.2.6 [adam 2020-04-23]
        Updated net/qbittorrent to 4.2.4 [adam 2020-04-23]
        Removed multimedia/libquicktime [nia 2020-04-23]
->>>>>>> 1.2477
        Updated net/ocamlnet to 4.1.7 [jaapb 2020-04-23]