CVS commit: pkgsrc/doc

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Dec 29 12:49:35 UTC 2019

Modified Files:
        pkgsrc/doc: CHANGES-2019

Log Message:
doc: Remove conflicting lines


To generate a diff of this commit:
cvs rdiff -u -r1.5529 -r1.5530 pkgsrc/doc/CHANGES-2019

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-2019
diff -u pkgsrc/doc/CHANGES-2019:1.5529 pkgsrc/doc/CHANGES-2019:1.5530
--- pkgsrc/doc/CHANGES-2019:1.5529      Sun Dec 29 12:45:28 2019
+++ pkgsrc/doc/CHANGES-2019     Sun Dec 29 12:49:34 2019
@@ -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 @@ Changes to the packages collection and i
        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 @@ Changes to the packages collection and i
        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]