[pkgsrc/trunk]: pkgsrc/doc Remove conflict markers

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de15b86848ac
branches:  trunk
changeset: 328532:de15b86848ac
user:      roy <roy%pkgsrc.org@localhost>
date:      Tue Jan 22 15:33:01 2019 +0000

description:
Remove conflict markers

diffstat:

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

diffs (20 lines):

diff -r 1da3f929c863 -r de15b86848ac doc/CHANGES-2019
--- a/doc/CHANGES-2019  Tue Jan 22 15:31:52 2019 +0000
+++ b/doc/CHANGES-2019  Tue Jan 22 15:33:01 2019 +0000
@@ -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 @@
        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 geography/viking to 1.7 [gdt 2019-01-22]
        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]