CVS commit: [pkgsrc-2021Q4] pkgsrc/doc

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Feb  6 19:28:36 UTC 2022

Modified Files:
        pkgsrc/doc [pkgsrc-2021Q4]: CHANGES-pkgsrc-2021Q4

Log Message:
cvs commit: warning: file `doc/CHANGES-pkgsrc-2021Q4' seems to still contain conflict indicators


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 pkgsrc/doc/CHANGES-pkgsrc-2021Q4

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-pkgsrc-2021Q4
diff -u pkgsrc/doc/CHANGES-pkgsrc-2021Q4:1.1.2.9 pkgsrc/doc/CHANGES-pkgsrc-2021Q4:1.1.2.10
--- pkgsrc/doc/CHANGES-pkgsrc-2021Q4:1.1.2.9    Sun Feb  6 19:14:44 2022
+++ pkgsrc/doc/CHANGES-pkgsrc-2021Q4    Sun Feb  6 19:28:36 2022
@@ -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