diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2022-02-06 19:28:36 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2022-02-06 19:28:36 +0000 |
| commit | 1b2280e78d9d0b5af5d54e8f07066a42772f61d6 (patch) | |
| tree | 5113d13a1c5d7b9e3f932fe4520208819b607aed | |
| parent | 85acf74f14972182ba74c7cf78daa51330b11afe (diff) | |
| download | pkgsrc-1b2280e78d9d0b5af5d54e8f07066a42772f61d6.tar.gz | |
cvs commit: warning: file `doc/CHANGES-pkgsrc-2021Q4' seems to still contain conflict indicators
| -rw-r--r-- | doc/CHANGES-pkgsrc-2021Q4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/CHANGES-pkgsrc-2021Q4 b/doc/CHANGES-pkgsrc-2021Q4 index 8743ab63fdf..49ff9d8e117 100644 --- a/doc/CHANGES-pkgsrc-2021Q4 +++ b/doc/CHANGES-pkgsrc-2021Q4 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2021Q4,v 1.1.2.9 2022/02/06 19:14:44 bsiegert Exp $ +$NetBSD: CHANGES-pkgsrc-2021Q4,v 1.1.2.10 2022/02/06 19:28:36 bsiegert Exp $ Changes to packages and infrastructure on the pkgsrc-2021Q4 branch: @@ -48,7 +48,6 @@ security/clamav: security fix Pullup ticket #6572 - requested by taca net/samba4: security fix -<<<<<<< CHANGES-pkgsrc-2021Q4 Pullup ticket #6573 - requested by nia x11/xkeyboard-config: build fix |