CVS commit: pkgsrc/doc

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu May 17 14:18:52 UTC 2018

Modified Files:
        pkgsrc/doc: CHANGES-2018

Log Message:
Clean up conflict cruft


To generate a diff of this commit:
cvs rdiff -u -r1.2452 -r1.2453 pkgsrc/doc/CHANGES-2018

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-2018
diff -u pkgsrc/doc/CHANGES-2018:1.2452 pkgsrc/doc/CHANGES-2018:1.2453
--- pkgsrc/doc/CHANGES-2018:1.2452      Thu May 17 14:10:22 2018
+++ pkgsrc/doc/CHANGES-2018     Thu May 17 14:18:52 2018
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2018,v 1.2452 2018/05/17 14:10:22 fhajny Exp $
+$NetBSD: CHANGES-2018,v 1.2453 2018/05/17 14:18:52 fhajny Exp $
 
 Changes to the packages collection and infrastructure in 2018:
 
@@ -3542,9 +3542,6 @@ Changes to the packages collection and i
        Updated graphics/erlang-eimp to 1.0.5 [fhajny 2018-05-17]
        Updated chat/ejabberd to 18.04 [fhajny 2018-05-17]
        Updated pkgtools/pkgin to 0.10.0 [jperkin 2018-05-17]
-<<<<<<< CHANGES-2018
        Updated devel/libbson to 1.9.5 [fhajny 2018-05-17]
-=======
        Updated security/lastpass-cli to 1.3.1 [jperkin 2018-05-17]
->>>>>>> 1.2451
        Updated databases/mongo-c-driver to 1.9.5 [fhajny 2018-05-17]