[pkgsrc/trunk]: pkgsrc/doc Clean up conflict cruft

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b2760170f46
branches:  trunk
changeset: 308197:4b2760170f46
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Thu May 17 14:18:52 2018 +0000

description:
Clean up conflict cruft

diffstat:

 doc/CHANGES-2018 |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (19 lines):

diff -r 72c72208297d -r 4b2760170f46 doc/CHANGES-2018
--- a/doc/CHANGES-2018  Thu May 17 14:12:02 2018 +0000
+++ b/doc/CHANGES-2018  Thu May 17 14:18:52 2018 +0000
@@ -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 @@
        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]