[pkgsrc/trunk]: pkgsrc/doc Properly added net/ocamlnet to CHANGES

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f41d61e94c3e
branches:  trunk
changeset: 427983:f41d61e94c3e
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu Apr 23 12:31:25 2020 +0000

description:
Properly added net/ocamlnet to CHANGES

diffstat:

 doc/CHANGES-2020 |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r c02c9593607a -r f41d61e94c3e doc/CHANGES-2020
--- a/doc/CHANGES-2020  Thu Apr 23 12:29:06 2020 +0000
+++ b/doc/CHANGES-2020  Thu Apr 23 12:31:25 2020 +0000
@@ -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 @@
        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 @@
        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]