[pkgsrc/trunk]: pkgsrc/doc Resolve conflict.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8db8a2ba7bc8
branches:  trunk
changeset: 652787:8db8a2ba7bc8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 07 22:47:51 2015 +0000

description:
Resolve conflict.

diffstat:

 doc/CHANGES-2015 |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 6abeaad03528 -r 8db8a2ba7bc8 doc/CHANGES-2015
--- a/doc/CHANGES-2015  Sun Jun 07 22:46:48 2015 +0000
+++ b/doc/CHANGES-2015  Sun Jun 07 22:47:51 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2015,v 1.2550 2015/06/07 22:46:48 joerg Exp $
+$NetBSD: CHANGES-2015,v 1.2551 2015/06/07 22:47:51 joerg Exp $
 
 Changes to the packages collection and infrastructure in 2015:
 
@@ -4787,9 +4787,6 @@
        Updated graphics/MesaLib to 10.5.7 [tnn 2015-06-07]
        Updated misc/ruby-daemons to 1.2.2 [taca 2015-06-07]
        Updated misc/ruby-equalizer to 0.0.11 [taca 2015-06-07]
-<<<<<<< CHANGES-2015
-       Updated security/openpam to 20140912 [joerg 2015-06-07]
-=======
        Updated databases/postgresql93 to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-adminpack to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-client to 9.3.8 [joerg 2015-06-07]
@@ -4805,5 +4802,4 @@
        Updated databases/postgresql93-replicationtools to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-server to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-upgrade to 9.3.8 [joerg 2015-06-07]
->>>>>>> 1.2549
        Updated security/openpam to 20140912 [joerg 2015-06-07]