summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES-20196
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/CHANGES-2019 b/doc/CHANGES-2019
index 0ba3ff44803..93a458e5943 100644
--- a/doc/CHANGES-2019
+++ b/doc/CHANGES-2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.5529 2019/12/29 12:45:28 leot Exp $
+$NetBSD: CHANGES-2019,v 1.5530 2019/12/29 12:49:34 leot Exp $
Changes to the packages collection and infrastructure in 2019:
@@ -8773,9 +8773,6 @@ Changes to the packages collection and infrastructure in 2019:
Updated devel/mustach to 0.99nb1 [sjmulder 2019-12-25]
Updated www/ruby-sass-rails to 5.0.7nb1 [taca 2019-12-26]
Updated news/tin to 2.4.4 [leot 2019-12-26]
-<<<<<<< CHANGES-2019
- Updated net/youtube-dl to 20191225 [leot 2019-12-26]
-=======
Updated net/youtube-dl to 20191225 [leot 2019-12-26]
Updated net/syncthing to 1.3.2 [gdt 2019-12-28]
Updated www/firefox60 to 60.9.0 [ryoon 2019-12-28]
@@ -8834,5 +8831,4 @@ Changes to the packages collection and infrastructure in 2019:
Updated multimedia/obs-studio to 24.0.5 [ryoon 2019-12-29]
Updated devel/cmake to 3.16.2 [adam 2019-12-29]
Updated cad/qcad to 3.24.0.1 [plunky 2019-12-29]
->>>>>>> 1.5528
Updated mail/msmtp to 1.8.7 [leot 2019-12-29]