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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56124393d7a8
branches:  trunk
changeset: 380456:56124393d7a8
user:      youri <youri%pkgsrc.org@localhost>
date:      Tue May 15 22:26:19 2018 +0000

description:
Fix conflict.

diffstat:

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

diffs (20 lines):

diff -r b8cf4617014d -r 56124393d7a8 doc/CHANGES-2018
--- a/doc/CHANGES-2018  Tue May 15 22:25:47 2018 +0000
+++ b/doc/CHANGES-2018  Tue May 15 22:26:19 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2018,v 1.2399 2018/05/15 22:25:47 youri Exp $
+$NetBSD: CHANGES-2018,v 1.2400 2018/05/15 22:26:19 youri Exp $
 
 Changes to the packages collection and infrastructure in 2018:
 
@@ -3480,10 +3480,7 @@
        Updated archivers/xfce4-thunar-archive to 0.4.0 [youri 2018-05-15]
        Updated x11/xfce4-settings to 4.13.2 [youri 2018-05-15]
        Updated sysutils/xfce4-appfinder to 4.13.0 [youri 2018-05-15]
-<<<<<<< CHANGES-2018
        Updated x11/xfce4-tumbler to 0.2.1 [youri 2018-05-15]
-=======
        Updated sysutils/py-psutil to 5.4.5 [minskim 2018-05-15]
->>>>>>> 1.2397
        Updated x11/xfce4-tumbler to 0.2.1 [youri 2018-05-15]
        Updated sysutils/xfce4-thunar to 1.7.2 [youri 2018-05-15]