Re: CVS commit: pkgsrc/doc

[Joerg Sonnenberger <joerg%bec.de@localhost>]

Please don't commit conflicts.

Joerg

On Sun, Jan 03, 2021 at 10:45:58AM +0000, Frederic Cambus wrote:
> Module Name:  pkgsrc
> Committed By: fcambus
> Date:         Sun Jan  3 10:45:58 UTC 2021
> 
> Modified Files:
>       pkgsrc/doc: CHANGES-2021
> 
> Log Message:
> doc: Updated converters/bdf2psf to 1.200
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.98 -r1.99 pkgsrc/doc/CHANGES-2021
> 
> 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-2021
> diff -u pkgsrc/doc/CHANGES-2021:1.98 pkgsrc/doc/CHANGES-2021:1.99
> --- pkgsrc/doc/CHANGES-2021:1.98      Sun Jan  3 10:43:08 2021
> +++ pkgsrc/doc/CHANGES-2021   Sun Jan  3 10:45:58 2021
> @@ -1,4 +1,4 @@
> -$NetBSD: CHANGES-2021,v 1.98 2021/01/03 10:43:08 adam Exp $
> +$NetBSD: CHANGES-2021,v 1.99 2021/01/03 10:45:58 fcambus Exp $
>  
>  Changes to the packages collection and infrastructure in 2021:
>  
> @@ -116,5 +116,10 @@ Changes to the packages collection and i
>       Updated math/R-RcppEigen to 0.3.3.9.1 [mef 2021-01-03]
>       Updated textproc/py-xmlschema to 1.4.1 [adam 2021-01-03]
>       Updated www/py-uvicorn to 0.13.3 [adam 2021-01-03]
> +<<<<<<< CHANGES-2021
> +     Updated converters/bdf2psf to 1.200 [fcambus 2021-01-03]
> +=======
>       Updated security/py-gssapi to 1.6.12 [adam 2021-01-03]
>       Updated security/py-asyncssh to 2.5.0 [adam 2021-01-03]
> +>>>>>>> 1.98
> +     Updated converters/bdf2psf to 1.200 [fcambus 2021-01-03]
>