CVS commit: pkgsrc/doc

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Tue May 15 22:26:19 UTC 2018

Modified Files:
        pkgsrc/doc: CHANGES-2018

Log Message:
Fix conflict.


To generate a diff of this commit:
cvs rdiff -u -r1.2399 -r1.2400 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.2399 pkgsrc/doc/CHANGES-2018:1.2400
--- pkgsrc/doc/CHANGES-2018:1.2399      Tue May 15 22:25:47 2018
+++ pkgsrc/doc/CHANGES-2018     Tue May 15 22:26:19 2018
@@ -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 @@ Changes to the packages collection and i
        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]