[pkgsrc/trunk]: pkgsrc/doc doc: Remove conflicting lines

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f1ab5fc2e18
branches:  trunk
changeset: 419834:6f1ab5fc2e18
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun Dec 29 12:49:34 2019 +0000

description:
doc: Remove conflicting lines

diffstat:

 doc/CHANGES-2019 |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 364a1fd1a0a7 -r 6f1ab5fc2e18 doc/CHANGES-2019
--- a/doc/CHANGES-2019  Sun Dec 29 12:45:28 2019 +0000
+++ b/doc/CHANGES-2019  Sun Dec 29 12:49:34 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.5529 2019/12/29 12:45:28 leot Exp $
+$NetBSD: CHANGES-2019,v 1.5530 2019/12/29 12:49:34 leot Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -8773,9 +8773,6 @@
        Updated devel/mustach to 0.99nb1 [sjmulder 2019-12-25]
        Updated www/ruby-sass-rails to 5.0.7nb1 [taca 2019-12-26]
        Updated news/tin to 2.4.4 [leot 2019-12-26]
-<<<<<<< CHANGES-2019
-       Updated net/youtube-dl to 20191225 [leot 2019-12-26]
-=======
        Updated net/youtube-dl to 20191225 [leot 2019-12-26]
        Updated net/syncthing to 1.3.2 [gdt 2019-12-28]
        Updated www/firefox60 to 60.9.0 [ryoon 2019-12-28]
@@ -8834,5 +8831,4 @@
        Updated multimedia/obs-studio to 24.0.5 [ryoon 2019-12-29]
        Updated devel/cmake to 3.16.2 [adam 2019-12-29]
        Updated cad/qcad to 3.24.0.1 [plunky 2019-12-29]
->>>>>>> 1.5528
        Updated mail/msmtp to 1.8.7 [leot 2019-12-29]