[pkgsrc/trunk]: pkgsrc/doc doc/CHANGES-2020: remove conflict indicators

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1616531403c7
branches:  trunk
changeset: 427868:1616531403c7
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Apr 21 13:57:57 2020 +0000

description:
doc/CHANGES-2020: remove conflict indicators

diffstat:

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

diffs (20 lines):

diff -r 24135eefe31c -r 1616531403c7 doc/CHANGES-2020
--- a/doc/CHANGES-2020  Tue Apr 21 13:56:39 2020 +0000
+++ b/doc/CHANGES-2020  Tue Apr 21 13:57:57 2020 +0000
@@ -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 @@
        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]