Mon Sep 18 12:03:29 2017 UTC ()
doc/CHANGES-2017: remove conflict markers


(wiz)
diff -r1.4005 -r1.4006 pkgsrc/doc/CHANGES-2017
cvs diff -r1.4005 -r1.4006 pkgsrc/doc/CHANGES-2017 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2017 2017/09/18 12:02:54 1.4005
+++ pkgsrc/doc/CHANGES-2017 2017/09/18 12:03:29 1.4006
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2017,v 1.4005 2017/09/18 12:02:54 wiz Exp $ 1$NetBSD: CHANGES-2017,v 1.4006 2017/09/18 12:03:29 wiz Exp $
2 2
3Changes to the packages collection and infrastructure in 2017: 3Changes to the packages collection and infrastructure in 2017:
4 4
5 Updated ham/fldigi to 3.23.19 [mef 2017-01-01] 5 Updated ham/fldigi to 3.23.19 [mef 2017-01-01]
6 Updated cad/gtkwave to 3.3.79 [mef 2017-01-01] 6 Updated cad/gtkwave to 3.3.79 [mef 2017-01-01]
7 Updated devel/py-requests to 2.12.4nb1 [ryoon 2017-01-01] 7 Updated devel/py-requests to 2.12.4nb1 [ryoon 2017-01-01]
8 Updated archivers/xz to 5.2.3 [mef 2017-01-01] 8 Updated archivers/xz to 5.2.3 [mef 2017-01-01]
9 Updated sysutils/py-psutil to 5.0.1 [ryoon 2017-01-01] 9 Updated sysutils/py-psutil to 5.0.1 [ryoon 2017-01-01]
10 Updated net/aria2 to 1.30.0 [ryoon 2017-01-01] 10 Updated net/aria2 to 1.30.0 [ryoon 2017-01-01]
11 Updated audio/chromaprint to 1.4.2 [mef 2017-01-01] 11 Updated audio/chromaprint to 1.4.2 [mef 2017-01-01]
12 Updated cad/klayout to 0.24.9 [mef 2017-01-01] 12 Updated cad/klayout to 0.24.9 [mef 2017-01-01]
13 Updated textproc/xapian to 1.4.2 [schmonz 2017-01-01] 13 Updated textproc/xapian to 1.4.2 [schmonz 2017-01-01]
14 Updated textproc/xapian-omega to 1.4.2 [schmonz 2017-01-01] 14 Updated textproc/xapian-omega to 1.4.2 [schmonz 2017-01-01]
@@ -5555,19 +5555,16 @@ Changes to the packages collection and i @@ -5555,19 +5555,16 @@ Changes to the packages collection and i
5555 Updated graphics/rabbit to 2.2.1 [taca 2017-09-18] 5555 Updated graphics/rabbit to 2.2.1 [taca 2017-09-18]
5556 Updated sysutils/puppet to 5.2.0 [taca 2017-09-18] 5556 Updated sysutils/puppet to 5.2.0 [taca 2017-09-18]
5557 Updated net/samba4 to 4.6.7 [taca 2017-09-18] 5557 Updated net/samba4 to 4.6.7 [taca 2017-09-18]
5558 Updated games/ruby-squib to 0.13.4nb1 [taca 2017-09-18] 5558 Updated games/ruby-squib to 0.13.4nb1 [taca 2017-09-18]
5559 Updated mail/ruby-actionmailer42 to 4.2.8nb1 [taca 2017-09-18] 5559 Updated mail/ruby-actionmailer42 to 4.2.8nb1 [taca 2017-09-18]
5560 Updated lang/py-six to 1.11.0 [adam 2017-09-18] 5560 Updated lang/py-six to 1.11.0 [adam 2017-09-18]
5561 Updated sysutils/p5-Daemon-Generic to 0.85 [wiz 2017-09-18] 5561 Updated sysutils/p5-Daemon-Generic to 0.85 [wiz 2017-09-18]
5562 Updated sysutils/p5-Gnome2-VFS to 1.083 [wiz 2017-09-18] 5562 Updated sysutils/p5-Gnome2-VFS to 1.083 [wiz 2017-09-18]
5563 Updated sysutils/p5-Server-Starter to 0.33 [wiz 2017-09-18] 5563 Updated sysutils/p5-Server-Starter to 0.33 [wiz 2017-09-18]
5564 Updated sysutils/p5-Sys-SigAction to 0.23 [wiz 2017-09-18] 5564 Updated sysutils/p5-Sys-SigAction to 0.23 [wiz 2017-09-18]
5565 Updated sysutils/p5-Sys-Syslog to 0.35 [wiz 2017-09-18] 5565 Updated sysutils/p5-Sys-Syslog to 0.35 [wiz 2017-09-18]
5566 Updated textproc/p5-Data-FormValidator to 4.88 [wiz 2017-09-18] 5566 Updated textproc/p5-Data-FormValidator to 4.88 [wiz 2017-09-18]
5567 Updated textproc/p5-Lingua-EN-Inflect to 1.902 [wiz 2017-09-18] 5567 Updated textproc/p5-Lingua-EN-Inflect to 1.902 [wiz 2017-09-18]
5568<<<<<<< CHANGES-2017 
5569 Updated textproc/p5-Lingua-EN-Syllable to 0.30 [wiz 2017-09-18] 5568 Updated textproc/p5-Lingua-EN-Syllable to 0.30 [wiz 2017-09-18]
5570======= 
5571 Updated textproc/py-lxml to 4.0.0 [adam 2017-09-18] 5569 Updated textproc/py-lxml to 4.0.0 [adam 2017-09-18]
5572>>>>>>> 1.4004 
5573 Updated textproc/p5-PDF-Table to 0.9.13 [wiz 2017-09-18] 5570 Updated textproc/p5-PDF-Table to 0.9.13 [wiz 2017-09-18]