[pkgsrc/pkgsrc-2021Q4]: pkgsrc/doc cvs commit: warning: file `doc/CHANGES-pkg...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14a0c90c4c4b
branches:  pkgsrc-2021Q4
changeset: 373124:14a0c90c4c4b
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Feb 06 19:28:36 2022 +0000

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

diffstat:

 doc/CHANGES-pkgsrc-2021Q4 |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 3eb3f3ac635d -r 14a0c90c4c4b doc/CHANGES-pkgsrc-2021Q4
--- a/doc/CHANGES-pkgsrc-2021Q4 Sun Feb 06 19:14:44 2022 +0000
+++ b/doc/CHANGES-pkgsrc-2021Q4 Sun Feb 06 19:28:36 2022 +0000
@@ -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 @@
 Pullup ticket #6572 - requested by taca
 net/samba4: security fix
 
-<<<<<<< CHANGES-pkgsrc-2021Q4
 Pullup ticket #6573 - requested by nia
 x11/xkeyboard-config: build fix