CVS commit: pkgsrc/doc

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Tue Jan 22 15:33:01 UTC 2019

Modified Files:
        pkgsrc/doc: CHANGES-2019

Log Message:
Remove conflict markers


To generate a diff of this commit:
cvs rdiff -u -r1.385 -r1.386 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.385 pkgsrc/doc/CHANGES-2019:1.386
--- pkgsrc/doc/CHANGES-2019:1.385       Tue Jan 22 15:31:52 2019
+++ pkgsrc/doc/CHANGES-2019     Tue Jan 22 15:33:01 2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.385 2019/01/22 15:31:52 roy Exp $
+$NetBSD: CHANGES-2019,v 1.386 2019/01/22 15:33:01 roy Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -526,9 +526,5 @@ Changes to the packages collection and i
        Updated www/apache-tomcat7 to 7.0.92 [ryoon 2019-01-22]
        Updated www/apache-tomcat85 to 8.5.37 [ryoon 2019-01-22]
        Added www/apache-tomcat9 version 9.0.14 [ryoon 2019-01-22]
-<<<<<<< CHANGES-2019
-       Updated net/dhcpcd to 7.1.0 [roy 2019-01-22]
-=======
        Updated geography/viking to 1.7 [gdt 2019-01-22]
->>>>>>> 1.384
        Updated net/dhcpcd to 7.1.0 [roy 2019-01-22]