CVS commit: pkgsrc/doc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Apr 21 13:57:58 UTC 2020

Modified Files:
        pkgsrc/doc: CHANGES-2020

Log Message:
doc/CHANGES-2020: remove conflict indicators


To generate a diff of this commit:
cvs rdiff -u -r1.2436 -r1.2437 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.2436 pkgsrc/doc/CHANGES-2020:1.2437
--- pkgsrc/doc/CHANGES-2020:1.2436      Tue Apr 21 13:56:39 2020
+++ pkgsrc/doc/CHANGES-2020     Tue Apr 21 13:57:57 2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.2436 2020/04/21 13:56:39 nia Exp $
+$NetBSD: CHANGES-2020,v 1.2437 2020/04/21 13:57:57 nia Exp $
 
 Changes to the packages collection and infrastructure in 2020:
 
@@ -3363,10 +3363,7 @@ Changes to the packages collection and i
        Updated www/ocsigen-i18n to 3.5.0 [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]
-<<<<<<< CHANGES-2020
        Updated net/cacti to 1.2.7 [mef 2020-04-21]
-=======
        Updated graphics/feh to 3.4 [nia 2020-04-21]
->>>>>>> 1.2434
        Updated net/cacti to 1.2.11 [mef 2020-04-21]
        Updated filesystems/fuse-curlftpfs to 0.9.2 [nia 2020-04-21]