Received: by mail.netbsd.org (Postfix, from userid 605) id BD28F84D79; Thu, 17 May 2018 14:18:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4238884D5B for ; Thu, 17 May 2018 14:18:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id m09ge5Yu95CP for ; Thu, 17 May 2018 14:18:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9DBC784CFB for ; Thu, 17 May 2018 14:18:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 93E36FBEC; Thu, 17 May 2018 14:18:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526566732126120" MIME-Version: 1.0 Date: Thu, 17 May 2018 14:18:52 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/doc To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20180517141852.93E36FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1526566732126120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1526566732126120 Content-Disposition: inline Content-Length: 904 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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] --_----------=_1526566732126120--